Pseudo-merge EPEL-5/EPEL-6/Fedora versions

perl-Module-Signature.spec

@@ -1,56 +1,59 @@
 Name:           perl-Module-Signature
 Version:        0.67
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CPAN signature management utilities and modules
-
 Group:          Development/Libraries
 License:        CC0
 URL:            http://search.cpan.org/dist/Module-Signature/
-Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Module-Signature-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Module-Signature-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
-
 BuildArch:      noarch
 BuildRequires:  gnupg
+BuildRequires:  perl(Digest::SHA)
 BuildRequires:  perl(Digest::SHA1)
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  perl(IPC::Run)
 BuildRequires:  perl(Test::More)
 Requires:       gnupg
+Requires:       perl(Digest::SHA)
 Requires:       perl(Digest::SHA1)
-# Optional, but no way to tell that to rpm at the moment :(
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+# Would prefer this to be Suggests: really...
 Requires:       perl(PAR::Dist)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This package contains command line tools and utilities a module for
 checking and creating SIGNATURE files for Perl CPAN distributions.
 
-
 %prep
-%setup -q -n Module-Signature-%{version}
+%setup -q -c -n Module-Signature
 
+# Copy up documentation for convenience with %%doc
+cp -a Module-Signature-%{version}/{AUTHORS,Changes,README,*.pub} .
+
+# Create a GPG directory for testing, to avoid using ~/.gnupg
+mkdir --mode=0700 gnupghome
 
 %build
-echo n | %{__perl} Makefile.PL INSTALLDIRS=vendor
+export GNUPGHOME=$(pwd)/gnupghome
+cd Module-Signature-%{version}
+perl Makefile.PL INSTALLDIRS=vendor --skipdeps
 make %{?_smp_mflags}
-
+cd -
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make pure_install DESTDIR=$RPM_BUILD_ROOT
+make -C Module-Signature-%{version} pure_install DESTDIR=%{buildroot}
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';'
+find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
-%{_fixperms} $RPM_BUILD_ROOT/*
+chmod -R u+w %{buildroot}
-
 
 %check
-# Signature test would need network access
+export GNUPGHOME=$(pwd)/gnupghome
-make test
+make -C Module-Signature-%{version} test TEST_SIGNATURE=1
-
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-
 
 %files
 %defattr(-,root,root,-)
@@ -58,10 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cpansign
 %{perl_vendorlib}/Module/
 %{_mandir}/man1/cpansign.1*
-%{_mandir}/man3/Module::Signature.3*
+%{_mandir}/man3/Module::Signature.3pm*
-
 
 %changelog
+* Thu Apr 21 2011 Paul Howarth <paul@city-fan.org> - 0.67-3
+- Pseudo-merge EPEL-5/EPEL-6/Fedora versions
+
 * Tue Apr 19 2011 Ville Skyttä <ville.skytta@iki.fi> - 0.67-2
 - Appease rpmbuild >= 4.9.
 
@@ -72,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Mon Dec 20 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.66-2
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Tue Sep  7 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.66-1
 - Update to 0.66 (#630714).