[perl-Carp-Fix-1_25] Unbundle Test-Simple and use the system one (#998410)

[Paul Howarth]

commit 6123b324d7848638855e2760d75cfd2ea19fc335
Author: Paul Howarth <paul at city-fan.org>
Date:   Thu Aug 22 19:33:19 2013 +0100

    Unbundle Test-Simple and use the system one (#998410)
    
    Since we now require Test::More ≥ 0.88, drop EPEL-5 compatibility

 perl-Carp-Fix-1_25.spec |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/perl-Carp-Fix-1_25.spec b/perl-Carp-Fix-1_25.spec
index 3c737a1..b26d762 100644
--- a/perl-Carp-Fix-1_25.spec
+++ b/perl-Carp-Fix-1_25.spec
@@ -1,19 +1,18 @@
 Name:		perl-Carp-Fix-1_25
 Version:	1.000001
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Smooth over incompatible changes in Carp 1.25
 License:	GPL+ or Artistic
 Group:		Development/Libraries
 URL:		https://metacpan.org/release/Carp-Fix-1_25
 Source0:	http://cpan.metacpan.org/authors/id/M/MS/MSCHWERN/Carp-Fix-1_25-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildArch:	noarch
 BuildRequires:	perl(Carp)
 BuildRequires:	perl(Exporter)
 BuildRequires:	perl(lib)
 BuildRequires:	perl(Module::Build)
 BuildRequires:	perl(strict)
-BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::More) >= 0.88
 BuildRequires:	perl(warnings)
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
@@ -35,27 +34,31 @@ namespace at a time.
 %prep
 %setup -q -n Carp-Fix-1_25-%{version}
 
+# Unbundle Test-Simple and use the system one (#998410)
+rm -rf t/lib/Test
+sed -i -e '/^t\/lib\/Test\//d' MANIFEST
+
 %build
 perl Build.PL installdirs=vendor
 ./Build
 
 %install
-rm -rf %{buildroot}
 ./Build install destdir=%{buildroot} create_packlist=0
 %{_fixperms} %{buildroot}
 
 %check
 ./Build test
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %doc Changes LICENSE README
 %{perl_vendorlib}/Carp/
 %{_mandir}/man3/Carp::Fix::1_25.3pm*
 
 %changelog
+* Thu Aug 22 2013 Paul Howarth <paul at city-fan.org> - 1.000001-3
+- Unbundle Test-Simple and use the system one (#998410)
+- Since we now require Test::More ≥ 0.88, drop EPEL-5 compatibility
+
 * Mon Aug 19 2013 Paul Howarth <paul at city-fan.org> - 1.000001-2
 - Sanitize for Fedora submission