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

[Paul Howarth]

commit e562923a101133a5ff94e32787747f8cc5de4e50
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Aug 24 20:03:45 2012 +0100

    Drop EPEL-4 support
    
    - Drop EPEL-4 support
      - Drop %defattr, redundant since rpm 4.4
      - Test::LeakTrace, Test::Requires and Test::Script are now universally available
      - A suitably recent version of ExtUtils::MakeMaker is now universally available
    - Don't need to remove empty directories from the buildroot

 Package-Stash-0.31-no-Test::Requires.patch  |   11 -------
 Package-Stash-0.32-EU::MM-version.patch     |   30 --------------------
 Package-Stash-0.32-no-Test::LeakTrace.patch |   26 -----------------
 perl-Package-Stash.spec                     |   40 ++++++---------------------
 4 files changed, 9 insertions(+), 98 deletions(-)
---
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index dfd307d..43359f9 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -1,21 +1,15 @@
 # We need to patch the test suite if we have an old version of Test::More
-%global old_test_more %(perl -MTest::More -e 'printf "%d\\n", $Test::More::VERSION < 0.88 ? 1 : 0;' 2>/dev/null || echo 0)
-
-# We don't really need ExtUtils::MakeMaker ≥ 6.30
-%global old_eumm %(perl -MExtUtils::MakeMaker -e 'printf "%d\\n", $ExtUtils::MakeMaker::VERSION < 6.30 ? 1 : 0;' 2>/dev/null || echo 0)
+%global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0)
 
 Name:		perl-Package-Stash
 Version:	0.33
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Routines for manipulating stashes
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Package-Stash/
 Source0:	http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-%{version}.tar.gz
-Patch0:		Package-Stash-0.32-EU::MM-version.patch
 Patch1:		Package-Stash-0.32-old-Test::More.patch
-Patch2:		Package-Stash-0.31-no-Test::Requires.patch
-Patch3:		Package-Stash-0.32-no-Test::LeakTrace.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	perl(Carp)
@@ -35,15 +29,9 @@ BuildRequires:	perl(Test::More)
 BuildRequires:	perl(Test::NoTabs)
 BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Pod::Coverage)
-# Test::Requires not in EPEL-4
-%if "%{?rhel}" != "4"
 BuildRequires:	perl(Test::Requires)
-%endif
-# Test::LeakTrace and Test::Script not in EPEL-4 or EPEL-5
-%if "%{?rhel}" != "4" && "%{?rhel}" != "5"
 BuildRequires:	perl(Test::LeakTrace)
 BuildRequires:	perl(Test::Script)
-%endif
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 # For performance and consistency
 Requires:	perl(Package::Stash::XS) >= 0.24
@@ -58,26 +46,11 @@ a simple API.
 %prep
 %setup -q -n Package-Stash-%{version}
 
-# Don't really need ExtUtils::MakeMaker ≥ 6.30
-%if %{old_eumm}
-%patch0 -p1
-%endif
-
 # Compatibility with old Test::More versions
 %if %{old_test_more}
 %patch1 -p1
 %endif
 
-# Work around absence of Test::Requires in EPEL-4
-%if "%{?rhel}" == "4"
-%patch2 -p1
-%endif
-
-# Skip the memory leak tests if we don't have Test::LeakTrace
-%if "%{?rhel}" == "4" || "%{?rhel}" == "5"
-%patch3 -p1
-%endif
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -86,7 +59,6 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
 %{_fixperms} %{buildroot}
 
 %check
@@ -96,7 +68,6 @@ make test AUTHOR_TESTING=1 RELEASE_TESTING=1
 rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{_bindir}/package-stash-conflicts
 %{perl_vendorlib}/Package/
@@ -104,6 +75,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash::PP.3pm*
 
 %changelog
+* Fri Aug 24 2012 Paul Howarth <paul at city-fan.org> - 0.33-6
+- Drop EPEL-4 support
+  - Drop %%defattr, redundant since rpm 4.4
+  - Test::LeakTrace, Test::Requires and Test::Script are now universally available
+  - A suitably recent version of ExtUtils::MakeMaker is now universally available
+- Don't need to remove empty directories from the buildroot
+
 * Tue Aug 14 2012 Petr Pisar <ppisar at redhat.com> - 0.33-5
 - Specify all dependendencies