From e70b804344eac869d55890b4b3e87e976997886a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <con...@redhat.com>
Date: Thu, 11 Jun 2015 16:06:05 +0200
Subject: Avoid FTBFS with perl5.22
diff --git a/Test-Prereq-1.038-perl522.patch b/Test-Prereq-1.038-perl522.patch
new file mode 100644
index 0000000..bda56c0
--- /dev/null
+++ b/Test-Prereq-1.038-perl522.patch
@@ -0,0 +1,33 @@
+diff --git a/t/get_loaded_modules.t b/t/get_loaded_modules.t
+index fd09aa0..94e023f 100644
+--- a/t/get_loaded_modules.t
++++ b/t/get_loaded_modules.t
+@@ -11,7 +11,7 @@ print STDERR "Didn't find right modules! Found < @$keys >\n"
unless
+ ok(
+ eq_array( $keys,
+ [
+- qw( Module::Info Test::Prereq Test::Prereq::Build )
++ qw( Module::Build Module::Info Test::Prereq Test::Prereq::Build
)
+ ] ),
+ 'Right modules for modules and tests'
+ );
+diff --git a/t/prereq_ok.t b/t/prereq_ok.t
+index 663a397..2621e2d 100644
+--- a/t/prereq_ok.t
++++ b/t/prereq_ok.t
+@@ -1,2 +1,2 @@
+ use Test::Prereq;
+-prereq_ok( undef, undef, [ qw(CPANPLUS::Internals::System) ] );
++prereq_ok( undef, undef, [ qw(CPANPLUS::Internals::System Module::Build) ] );
+diff --git a/t/prior_plan.t b/t/prior_plan.t
+index 78b4dd1..849c456 100644
+--- a/t/prior_plan.t
++++ b/t/prior_plan.t
+@@ -1,6 +1,6 @@
+ use Test::More 0.95;
+
+ use Test::Prereq;
+-prereq_ok( undef, undef, [ qw(CPANPLUS::Internals::System) ] );
++prereq_ok( undef, undef, [ qw(CPANPLUS::Internals::System Module::Build) ] );
+
+ done_testing();
diff --git a/perl-Test-Prereq.spec b/perl-Test-Prereq.spec
index 4cd34b7..668ccc1 100644
--- a/perl-Test-Prereq.spec
+++ b/perl-Test-Prereq.spec
@@ -1,11 +1,16 @@
Name: perl-Test-Prereq
Version: 1.038
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Check if Makefile.PL has the right pre-requisites
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/Test-Prereq/
Source0:
http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Prereq-%{version}.tar.gz
+# This doesn't really fix the underlying problem, however, it's
+# a good enough downstream FTBFS workaround. Upstream should
+# approach this whole thing rather differently...
+# rhbz#1230742, rt#96099
+Patch0: Test-Prereq-1.038-perl522.patch
BuildArch: noarch
# Build
BuildRequires: perl
@@ -40,6 +45,7 @@ section of Makefile.PL.
%prep
%setup -q -n Test-Prereq-%{version}
+%patch0 -p1
%build
perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1
@@ -61,6 +67,9 @@ make test
%{_mandir}/man3/*
%changelog
+* Thu Jun 11 2015 Petr Šabata <con...@redhat.com> - 1.038-3
+- Avoid FTBFS with perl5.22
+
* Sat Jun 06 2015 Jitka Plesnikova <jples...@redhat.com> - 1.038-2
- Perl 5.22 rebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/perl-Test-Prereq.git/commit/?h=master&id=e70b804344eac869d55890b4b3e87e976997886a
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
