From 3d96613ca6b9b8cceecaed1b71c07ca243efea8d Mon Sep 17 00:00:00 2001 From: cvsextras Date: Mon, 8 Nov 2004 05:03:17 +0000 Subject: [PATCH] auto-import changelog data from perl-Image-Info-1.16-0.fdr.3.rh90.src.rpm 1.16-0.fdr.3 - Reverted Image::Xbm and Image::Xpm patches. - Patched Image::Info::XBM.pm and Image::Info::XPM.pm instead. 1.16-0.fdr.2 - Patched Image::Xbm and Image::Xpm to avoid test failures in this module. 1.16-0.fdr.1 - Update to version 1.16. - Bring up to date with current fedora.us perl spec template. 1.15-0.fdr.1 - First build. --- .cvsignore | 1 + Image-Info-1.16-XBM.pm.patch | 13 ++++++ Image-Info-1.16-XPM.pm.patch | 12 ++++++ Image-Info-1.16-string.t.patch | 14 +++++++ perl-Image-Info.spec | 76 ++++++++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 117 insertions(+) create mode 100644 Image-Info-1.16-XBM.pm.patch create mode 100644 Image-Info-1.16-XPM.pm.patch create mode 100644 Image-Info-1.16-string.t.patch create mode 100644 perl-Image-Info.spec diff --git a/.cvsignore b/.cvsignore index e69de29..24b4cb7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +Image-Info-1.16.tar.gz diff --git a/Image-Info-1.16-XBM.pm.patch b/Image-Info-1.16-XBM.pm.patch new file mode 100644 index 0000000..fea9e2c --- /dev/null +++ b/Image-Info-1.16-XBM.pm.patch @@ -0,0 +1,13 @@ +diff -ruN Image-Info-1.16/lib/Image/Info/XBM.pm Image-Info-1.16-patched/lib/Image/Info/XBM.pm +--- Image-Info-1.16/lib/Image/Info/XBM.pm 2004-01-07 12:16:51.000000000 +0000 ++++ Image-Info-1.16-patched/lib/Image/Info/XBM.pm 2004-06-08 22:30:10.000000000 +0100 +@@ -10,7 +10,8 @@ + $info->push_info(0, "Warn", shift); + }; + +- my $i = Image::Xbm->new(-file, $source); ++ my $i = Image::Xbm->new(-width => 1, -height => 1); ++ $i->load($source); + + $info->push_info(0, "color_type" => "Grey"); + $info->push_info(0, "file_ext" => "xbm"); diff --git a/Image-Info-1.16-XPM.pm.patch b/Image-Info-1.16-XPM.pm.patch new file mode 100644 index 0000000..ee019a3 --- /dev/null +++ b/Image-Info-1.16-XPM.pm.patch @@ -0,0 +1,12 @@ +--- Image-Info-1.16/lib/Image/Info/XPM.pm 2004-01-07 12:20:40.000000000 +0000 ++++ Image-Info-1.16-patched/lib/Image/Info/XPM.pm 2004-07-01 01:25:55.000000000 +0100 +@@ -13,7 +13,8 @@ + $info->push_info(0, "Warn", shift); + }; + +- my $i = Image::Xpm->new(-file, $source); ++ my $i = Image::Xpm->new(-width => 1, -height => 1); ++ $i->load($source); + + $info->push_info(0, "color_type" => "Indexed-RGB"); + $info->push_info(0, "file_ext" => "xpm"); diff --git a/Image-Info-1.16-string.t.patch b/Image-Info-1.16-string.t.patch new file mode 100644 index 0000000..a5b1c32 --- /dev/null +++ b/Image-Info-1.16-string.t.patch @@ -0,0 +1,14 @@ +diff -ruN Image-Info-1.16/t/string.t Image-Info-1.16-patched/t/string.t +--- Image-Info-1.16/t/string.t 2003-10-06 18:13:30.000000000 +0100 ++++ Image-Info-1.16-patched/t/string.t 2004-06-08 22:17:41.000000000 +0100 +@@ -30,6 +30,10 @@ + my $img = cat($file); + my $h2 = image_info(\$img); + ++ if (my $err = $h2->{error}) { ++ print "# - $err\n"; ++ } ++ + print "not " unless hash_equal($h1, $h2); + print "ok $testno\n"; + $testno++; diff --git a/perl-Image-Info.spec b/perl-Image-Info.spec new file mode 100644 index 0000000..eb00f9a --- /dev/null +++ b/perl-Image-Info.spec @@ -0,0 +1,76 @@ +%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} + +Name: perl-Image-Info +Version: 1.16 +Release: 0.fdr.3.rh90 +Epoch: 0 +Summary: Image meta information extraction module for Perl + +Group: Development/Libraries +License: GPL or Artistic +URL: http://search.cpan.org/dist/Image-Info/ +Source0: http://www.cpan.org/authors/id/G/GA/GAAS/Image-Info-1.16.tar.gz +Patch0: Image-Info-1.16-string.t.patch +Patch1: Image-Info-1.16-XBM.pm.patch +Patch2: Image-Info-1.16-XPM.pm.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: perl >= 1:5.6.1 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description +This Perl extension allows you to extract meta information from +various types of image files. + + +%prep +%setup -q -n Image-Info-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +chmod 644 Changes README exifdump imgdump + + +%build +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* + + +%check || : +make test + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc Changes README exifdump imgdump +%{perl_vendorlib}/Image/ +%{_mandir}/man3/*.3* + + +%changelog +* Thu Jul 1 2004 Jose Pedro Oliveira - 0:1.16-0.fdr.3 +- Reverted Image::Xbm and Image::Xpm patches. +- Patched Image::Info::XBM.pm and Image::Info::XPM.pm instead. + +* Tue Jun 8 2004 Jose Pedro Oliveira - 0:1.16-0.fdr.2 +- Patched Image::Xbm and Image::Xpm to avoid test failures in this module. + +* Thu Jun 3 2004 Jose Pedro Oliveira - 0:1.16-0.fdr.1 +- Update to version 1.16. +- Bring up to date with current fedora.us perl spec template. + +* Sun Oct 12 2003 Ville Skyttä - 0:1.15-0.fdr.1 +- First build. diff --git a/sources b/sources index e69de29..0908981 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +502b6299ef2d41f67bca4e1f7d9335ab Image-Info-1.16.tar.gz