[perl-Package-Stash-XS] Drop EPEL-4 support

Paul Howarth pghmcfc at fedoraproject.org
Sat Aug 25 16:15:18 UTC 2012


commit a12bed2df69dab71aa488a6bce323fe7c8854e00
Author: Paul Howarth <paul at city-fan.org>
Date:   Sat Aug 25 17:14:22 2012 +0100

    Drop EPEL-4 support
    
    - Drop EPEL-4 support
      - Test::LeakTrace now universally available
      - Suitably recent version of ExtUtils::MakeMaker now universally available
      - Drop %defattr, redundant since rpm 4.4
    - BR: perl(File::Temp)
    - Don't need to remove empty directories from the buildroot

 Package-Stash-XS-0.23-old-eumm.patch           |   30 ----------------------
 Package-Stash-XS-0.24-no-Test::LeakTrace.patch |   26 -------------------
 perl-Package-Stash-XS.spec                     |   32 +++++++++---------------
 3 files changed, 12 insertions(+), 76 deletions(-)
---
diff --git a/perl-Package-Stash-XS.spec b/perl-Package-Stash-XS.spec
index 04e1bca..33b6bf7 100644
--- a/perl-Package-Stash-XS.spec
+++ b/perl-Package-Stash-XS.spec
@@ -1,32 +1,28 @@
 Name:		perl-Package-Stash-XS
 Version:	0.25
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Faster and more correct implementation of the Package::Stash API
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Package-Stash-XS/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-%{version}.tar.gz
-Patch0:		Package-Stash-XS-0.23-old-eumm.patch
 Patch1:		Package-Stash-XS-0.24-old-Test::More.patch
-Patch2:		Package-Stash-XS-0.24-no-Test::LeakTrace.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	perl(constant)
 BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(File::Temp)
 BuildRequires:	perl(lib)
 BuildRequires:	perl(Pod::Coverage::TrustPod)
 BuildRequires:	perl(Scalar::Util)
 BuildRequires:	perl(Test::EOL)
 BuildRequires:	perl(Test::Fatal)
+BuildRequires:	perl(Test::LeakTrace)
 BuildRequires:	perl(Test::More)
 BuildRequires:	perl(Test::NoTabs)
 BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Pod::Coverage)
-# Some test suite requirements not universally available
-%if "%{?rhel}" != "4" && "%{?rhel}" != "5"
-BuildRequires:	perl(Test::LeakTrace) >= 0.11
 BuildRequires:	perl(XSLoader)
-%endif
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 # Don't "provide" private Perl libs
@@ -40,21 +36,11 @@ installed, and should be preferred in all environments with a compiler.
 %prep
 %setup -q -n Package-Stash-XS-%{version}
 
-# Don't really need ExtUtils::MakeMaker ≥ 6.30
-%if "%{?rhel}" == "4" || "%{?rhel}" == "5"
-%patch0 -p1
-%endif
-
 # Patch test suite to work with old Test::More versions if necessary
-%if "%{?rhel}" == "4" || "%{?rhel}" == "5"
+%if "%{?rhel}" == "5"
 %patch1 -p1
 %endif
 
-# Work around absence of Test::LeakTrace in EPEL-4 and EPEL-5
-%if "%{?rhel}" == "4" || "%{?rhel}" == "5"
-%patch2 -p1
-%endif
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
 make %{?_smp_mflags}
@@ -64,7 +50,6 @@ rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
-find %{buildroot} -depth -type d -exec rmdir {} ';' 2>/dev/null
 %{_fixperms} %{buildroot}
 
 %check
@@ -74,13 +59,20 @@ make test AUTHOR_TESTING=1 RELEASE_TESTING=1
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorarch}/auto/Package/
 %{perl_vendorarch}/Package/
 %{_mandir}/man3/Package::Stash::XS.3pm*
 
 %changelog
+* Sat Aug 25 2012 Paul Howarth <paul at city-fan.org> - 0.25-6
+- Drop EPEL-4 support
+  - Test::LeakTrace now universally available
+  - Suitably recent version of ExtUtils::MakeMaker now universally available
+  - Drop %%defattr, redundant since rpm 4.4
+- BR: perl(File::Temp)
+- Don't need to remove empty directories from the buildroot
+
 * Tue Aug 14 2012 Petr Pisar <ppisar at redhat.com> - 0.25-5
 - Specify all dependencies
 


More information about the scm-commits mailing list