From a12bed2df69dab71aa488a6bce323fe7c8854e00 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sat, 25 Aug 2012 17:14:22 +0100 Subject: [PATCH] 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 ----------------- ...age-Stash-XS-0.24-no-Test::LeakTrace.patch | 26 --------------- perl-Package-Stash-XS.spec | 32 +++++++------------ 3 files changed, 12 insertions(+), 76 deletions(-) delete mode 100644 Package-Stash-XS-0.23-old-eumm.patch delete mode 100644 Package-Stash-XS-0.24-no-Test::LeakTrace.patch diff --git a/Package-Stash-XS-0.23-old-eumm.patch b/Package-Stash-XS-0.23-old-eumm.patch deleted file mode 100644 index f2a81ce..0000000 --- a/Package-Stash-XS-0.23-old-eumm.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- Package-Stash-XS/Makefile.PL -+++ Package-Stash-XS/Makefile.PL -@@ -4,7 +4,7 @@ - - use 5.008001; - --use ExtUtils::MakeMaker 6.30; -+use ExtUtils::MakeMaker 6.17; - - - -@@ -16,7 +16,7 @@ - 'Test::More' => '0.88' - }, - 'CONFIGURE_REQUIRES' => { -- 'ExtUtils::MakeMaker' => '6.30' -+ 'ExtUtils::MakeMaker' => '6.17' - }, - 'DISTNAME' => 'Package-Stash-XS', - 'EXE_FILES' => [], -@@ -46,6 +46,9 @@ - delete $WriteMakefileArgs{CONFIGURE_REQUIRES} - unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; - -+delete $WriteMakefileArgs{LICENSE} -+ unless eval { ExtUtils::MakeMaker->VERSION(6.31) }; -+ - WriteMakefile(%WriteMakefileArgs); - - diff --git a/Package-Stash-XS-0.24-no-Test::LeakTrace.patch b/Package-Stash-XS-0.24-no-Test::LeakTrace.patch deleted file mode 100644 index ae28a20..0000000 --- a/Package-Stash-XS-0.24-no-Test::LeakTrace.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up Package-Stash-XS-0.24/t/author-leaks-debug.t.orig Package-Stash-XS-0.24/t/author-leaks-debug.t ---- Package-Stash-XS-0.24/t/author-leaks-debug.t.orig 2011-09-06 09:37:11.754912596 +0100 -+++ Package-Stash-XS-0.24/t/author-leaks-debug.t 2011-09-06 09:37:11.762912576 +0100 -@@ -12,7 +12,8 @@ use warnings; - use lib 't/lib'; - use Test::More; - use Test::Fatal; --use Test::LeakTrace; -+eval "use Test::LeakTrace"; -+plan skip_all => "Test::LeakTrace required for this test" if $@; - - BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE - -diff -up Package-Stash-XS-0.24/t/author-leaks.t.orig Package-Stash-XS-0.24/t/author-leaks.t ---- Package-Stash-XS-0.24/t/author-leaks.t.orig 2011-09-06 09:37:11.754912596 +0100 -+++ Package-Stash-XS-0.24/t/author-leaks.t 2011-09-06 09:37:11.762912576 +0100 -@@ -12,7 +12,8 @@ use warnings; - use lib 't/lib'; - use Test::More; - use Test::Fatal; --use Test::LeakTrace; -+eval "use Test::LeakTrace"; -+plan skip_all => "Test::LeakTrace required for this test" if $@; - - use Package::Stash; - use Symbol; 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 - 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 - 0.25-5 - Specify all dependencies