From 8f8585faa105262d9a0d45c9d6fab6f1cb66a9c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Wed, 26 Jan 2011 12:16:14 +0100 Subject: [PATCH] - Upstream update. - BR: giflib-devel instead of libungif-devel. - spec file massage. - Add perl_default_filter. --- .gitignore | 1 + perl-Imager.spec | 35 +++++++++++++++++++---------------- sources | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 4409d4c..3d004fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Imager-0.67.tar.gz /Imager-0.78.tar.gz /Imager-0.79.tar.gz +/Imager-0.80.tar.gz diff --git a/perl-Imager.spec b/perl-Imager.spec index 4df4c12..304c096 100644 --- a/perl-Imager.spec +++ b/perl-Imager.spec @@ -1,6 +1,6 @@ Name: perl-Imager -Version: 0.79 -Release: 2%{?dist} +Version: 0.80 +Release: 1%{?dist} Summary: Perl extension for Generating 24 bit Images License: GPL+ or Artistic Group: Development/Libraries @@ -8,7 +8,6 @@ URL: http://search.cpan.org/dist/Imager/ Source0: http://www.cpan.org/authors/id/T/TO/TONYC/Imager-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(Affix::Infix2Postfix) -BuildRequires: perl(ExtUtils::Depends) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Image::Math::Constrain) BuildRequires: perl(Inline) @@ -16,16 +15,20 @@ BuildRequires: perl(Parse::RecDescent) BuildRequires: perl(Test::More) >= 0.47 BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) >= 1.08 + BuildRequires: freetype-devel -BuildRequires: gdbm-devel +BuildRequires: giflib-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel -BuildRequires: libungif-devel BuildRequires: t1lib-devel +# rgb.txt, c.f. lib/Imager/Color.pm BuildRequires: rgb + Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%{?perl_default_filter} + %description Imager is a module for creating and altering images. It can read and write various image formats, draw primitive shapes like lines,and @@ -34,15 +37,10 @@ render text and more. %prep %setup -q -n Imager-%{version} - -%{__perl} -pi -e 's/my \$resp = /my \$resp = "n"/g' Makefile.PL - -# Quiet rpmlint. -find . -type f \( -perm +100 -o -name '*.pl' \) \ - -exec perl -pi -e 's,^(\#\!)perl,$1%{__perl}, if ($.==1);' {} \; -find . -type f -name '*.pm' \ - -exec perl -pi -e '$_=undef if ($.==1 and /^\#\!.*perl/)' {} \; -chmod a-x samples/* +# fix permissions +find \( -executable -a -type f \) -exec chmod -x {} \; +# Adjust shebang +sed -i -e "s,#!perl,#! %{__perl}," samples/* %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" @@ -67,13 +65,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changes* README -%doc samples/ +%doc Changes README samples %{perl_vendorarch}/auto/* %{perl_vendorarch}/Imager* %{_mandir}/man3/* %changelog +* Fri Jan 21 2011 Ralf Corsépius 0.80-1 +- Upstream update. +- BR: giflib-devel instead of libungif-devel. +- spec file massage. +- Add perl_default_filter. + * Fri Dec 17 2010 Marcela Maslanova - 0.79-2 - 661697 rebuild for fixing problems with vendorach/lib diff --git a/sources b/sources index 0923d9e..841e4d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eec0b53661ccce1fdb3b521037128a72 Imager-0.79.tar.gz +2505a581d4ca57448fbff756e850eda5 Imager-0.80.tar.gz