[perl-Module-Signature/el4/master] Pseudo-merge EPEL-5/EPEL-6/Fedora versions

Paul Howarth pghmcfc at fedoraproject.org
Thu Apr 21 14:16:28 UTC 2011


commit a185eb64584e8f7ed06d3f70263cd5887ec8298f
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Apr 21 14:07:02 2011 +0100

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

 perl-Module-Signature.spec |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/perl-Module-Signature.spec b/perl-Module-Signature.spec
index 649d8fd..2b3c9ae 100644
--- a/perl-Module-Signature.spec
+++ b/perl-Module-Signature.spec
@@ -1,6 +1,6 @@
 Name:           perl-Module-Signature
 Version:        0.67
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        CPAN signature management utilities and modules
 Group:          Development/Libraries
 License:        CC0
@@ -15,8 +15,9 @@ BuildRequires:  perl(IPC::Run)
 BuildRequires:  perl(Test::More)
 Requires:       gnupg
 Requires:       perl(Digest::SHA1)
-Requires(hint): perl(PAR::Dist)
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+# Would prefer this to be Suggests: really...
+Requires:       perl(PAR::Dist)
 
 %description
 This package contains command line tools and utilities a module for
@@ -30,18 +31,17 @@ cp -a Module-Signature-%{version}/{AUTHORS,Changes,README,*.pub} .
 
 # Create a GPG directory for testing, to avoid using ~/.gnupg
 mkdir --mode=0700 gnupghome
-export GNUPGHOME=$(pwd)/gnupghome
-gpg --import *.pub
 
 %build
+export GNUPGHOME=$(pwd)/gnupghome
 cd Module-Signature-%{version}
-PERL_AUTOINSTALL=--skipdeps perl Makefile.PL INSTALLDIRS=vendor --installdeps
+perl Makefile.PL INSTALLDIRS=vendor --skipdeps
 make %{?_smp_mflags}
 cd -
 
 %install
 rm -rf %{buildroot}
-make -C Module-Signature-%{version} pure_install PERL_INSTALL_ROOT=%{buildroot}
+make -C Module-Signature-%{version} pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
 chmod -R u+w %{buildroot}
@@ -62,6 +62,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Module::Signature.3pm*
 
 %changelog
+* Thu Apr 21 2011 Paul Howarth <paul at city-fan.org> - 0.67-3
+- Pseudo-merge EPEL-5/EPEL-6/Fedora versions
+
 * Mon Apr 18 2011 Paul Howarth <paul at city-fan.org> - 0.67-1
 - Update to 0.67
   - Better handling of \r (CPAN RT#46339)


More information about the scm-commits mailing list