[perl-GD] 2.46 bump

[Petr Šabata]

commit f61e4cb60d72530eb6082d8716880498ab5c2de5
Author: Petr Šabata <contyk at redhat.com>
Date:   Thu Oct 25 17:05:25 2012 +0200

    2.46 bump

 .gitignore   |    1 +
 perl-GD.spec |   49 ++++++++++++++++++++++++++-----------------------
 sources      |    2 +-
 3 files changed, 28 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f894a6d..13a390d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 GD-2.44.tar.gz
+/GD-2.46.tar.gz
diff --git a/perl-GD.spec b/perl-GD.spec
index 4c9a36d..ef708d7 100644
--- a/perl-GD.spec
+++ b/perl-GD.spec
@@ -1,22 +1,25 @@
 Name:           perl-GD
-Version:        2.44
-Release:        12%{?dist}
+Version:        2.46
+Release:        1%{?dist}
 Summary:        Perl interface to the GD graphics library
-
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/GD/
 Source0:        http://www.cpan.org/authors/id/L/LD/LDS/GD-%{version}.tar.gz
-Patch0:		perl-GD-2.41-Group.patch
-Patch1:		perl-GD-skip-3.patch
+Patch0:         perl-GD-2.41-Group.patch
+Patch1:         perl-GD-skip-3.patch
 # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
 # and https://rt.cpan.org/Public/Bug/Display.html?id=67990
 Patch2:         perl-GD-ccflags.patch
-
 BuildRequires:  gd-devel >= 2.0.28
+BuildRequires:  perl(constant)
+BuildRequires:  perl(AutoLoader)
+BuildRequires:  perl(Carp)
+BuildRequires:  perl(DynaLoader)
+BuildRequires:  perl(Exporter)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 Requires:       gd >= 2.0.28
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %{?perl_default_filter}
 
@@ -25,7 +28,6 @@ This is a autoloadable interface module for GD, a popular library
 for creating and manipulating PNG files.  With this library you can
 create PNG images on the fly or modify existing files.
 
-
 %prep
 %setup -q -n GD-%{version}
 %patch0 -p1
@@ -33,24 +35,21 @@ create PNG images on the fly or modify existing files.
 %patch1 -p1
 %endif
 %patch2 -p1
-%{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
-  qd.pl demos/{*.{pl,cgi},truetype_test}
+perl -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \
+      qd.pl demos/{*.{pl,cgi},truetype_test}
 chmod -c 644 bdf_scripts/* demos/*
 chmod -c 755 qd.pl
 
-
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" 
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
-
+perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" 
+make %{?_smp_mflags} OPTIMIZE="%{optflags}"
 
 %install
-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 f -name '*.bs' -empty -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
+find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null ';'
+chmod -R u+w %{buildroot}/*
 
 %check
 %ifarch ppc
@@ -60,11 +59,10 @@ make test
 %endif
 %ifarch %{ix86}
 perl t/GD.t --write
-: This is the file that should contain some blue color:
+#This is the file that should contain some blue color
 base64 t/test.out.3.png_new
 %endif
 
-
 %files
 %doc ChangeLog README README.QUICKDRAW demos/
 %{_bindir}/*
@@ -74,8 +72,13 @@ base64 t/test.out.3.png_new
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3pm*
 
-
 %changelog
+* Thu Oct 25 2012 Petr Šabata <contyk at redhat.com> - 2.46-1
+- 2.46 bump
+- Specify all dependencies
+- Drop command macros
+- Modernize the spec and clean whitespace
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.44-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a67403a..944b319 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b9a4d78a5af0616a96264b0aa354859  GD-2.44.tar.gz
+ea86a94eb45330eae27ecbfd5c2f43bb  GD-2.46.tar.gz