[perl-Test-EOL] Reinstate EPEL-5 compatibility

Paul Howarth pghmcfc at fedoraproject.org
Tue Aug 7 13:27:52 UTC 2012


commit 3bed51c60b16ea931c6a56ac79f620c9b24c8e48
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Aug 7 14:27:22 2012 +0100

    Reinstate EPEL-5 compatibility
    
    - Reinstate EPEL-5 compatibility
    - Drop redundant patch for building with ExtUtils::MakeMaker < 6.30

 Test-EOL-1.0-old-EU::MM.patch |   30 ------------------------------
 perl-Test-EOL.spec            |   24 ++++++++++++------------
 2 files changed, 12 insertions(+), 42 deletions(-)
---
diff --git a/perl-Test-EOL.spec b/perl-Test-EOL.spec
index 3625aba..1632093 100644
--- a/perl-Test-EOL.spec
+++ b/perl-Test-EOL.spec
@@ -1,20 +1,17 @@
-# We don't really need ExtUtils::MakeMaker ≥ 6.30
-%global old_eumm %(perl -MExtUtils::MakeMaker -e 'print (($ExtUtils::MakeMaker::VERSION < 6.30) ? 1 : 0);' 2>/dev/null || echo 0)
-
 Name:		perl-Test-EOL
 Version:	1.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Check the correct line endings in your project
 Group:		Development/Libraries
 License:	GPL+ or Artistic
 URL:		http://search.cpan.org/dist/Test-EOL/
 Source0:	http://search.cpan.org/CPAN/authors/id/B/BO/BOBTFISH/Test-EOL-%{version}.tar.gz
-Patch0:		Test-EOL-1.0-old-EU::MM.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	perl(Cwd)
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(File::Spec)
-BuildRequires:  perl(File::Temp)
+BuildRequires:	perl(File::Temp)
 # Simplify breaking dependency loops at bootstrap time
 %if 0%{!?perl_bootstrap:1}
 BuildRequires:	perl(Pod::Coverage::TrustPod)
@@ -22,7 +19,7 @@ BuildRequires:	perl(Pod::Coverage::TrustPod)
 BuildRequires:	perl(Test::Builder)
 BuildRequires:	perl(Test::More)
 BuildRequires:	perl(Test::NoTabs) >= 1.2
-BuildRequires:	perl(Test::Pod) >= 1.41
+BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Pod::Coverage) >= 1.08
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
@@ -34,16 +31,12 @@ whitespace.
 %prep
 %setup -q -n Test-EOL-%{version}
 
-# We don't really need ExtUtils::MakeMaker ≥ 6.30
-%if %{old_eumm}
-%patch0 -p1
-%endif
-
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
 make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 %{_fixperms} %{buildroot}
@@ -51,12 +44,19 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 %check
 make test RELEASE_TESTING=1
 
+%clean
+rm -rf %{buildroot}
+
 %files
 %doc Changes LICENSE README
 %{perl_vendorlib}/Test/
 %{_mandir}/man3/Test::EOL.3pm*
 
 %changelog
+* Tue Aug  7 2012 Paul Howarth <paul at city-fan.org> - 1.3-6
+- Reinstate EPEL-5 compatibility
+- Drop redundant patch for building with ExtUtils::MakeMaker < 6.30
+
 * Tue Aug  7 2012 Jitka Plesnikova <jplesnik at redhat.com>
 - Update BR and clean up spec for modern rpmbuild
 


More information about the scm-commits mailing list