From f38a4086ed226351f1b61d8376ae517c82acdfb4 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 7 Apr 2017 16:04:15 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20FTBFS=20with=20Test::Without::Module=20?= =?UTF-8?q?=E2=89=A5=200.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/moose/Class-Load/pull/2 --- ...ix-test-for-Test-Without-Module-0.19.patch | 25 +++++++++++++++++++ perl-Class-Load-XS.spec | 13 ++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 0001-Fix-test-for-Test-Without-Module-0.19.patch diff --git a/0001-Fix-test-for-Test-Without-Module-0.19.patch b/0001-Fix-test-for-Test-Without-Module-0.19.patch new file mode 100644 index 0000000..e041f8c --- /dev/null +++ b/0001-Fix-test-for-Test-Without-Module-0.19.patch @@ -0,0 +1,25 @@ +From 1f38167de051b0df00ca25ce8f351f9d8f3d21f1 Mon Sep 17 00:00:00 2001 +From: Paul Howarth +Date: Fri, 7 Apr 2017 11:58:01 +0100 +Subject: [PATCH] Fix test for Test::Without::Module 0.19 + +--- + t/012-without-implementation.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/012-without-implementation.t b/t/012-without-implementation.t +index 9f47c52..3191b52 100644 +--- a/t/012-without-implementation.t ++++ b/t/012-without-implementation.t +@@ -12,7 +12,7 @@ use Test::Without::Module qw( Class::Load::PP Class::Load::XS ); + { + like( + exception { require Class::Load }, +- qr/Class.Load.PP\.pm did not return a true value/, ++ qr!Can't locate Class/Load/PP\.pm in \@INC|Class.Load.PP\.pm did not return a true value!, + 'error when loading Class::Load and no implementation is available includes errors from trying to load modules' + ); + } +-- +2.9.3 + diff --git a/perl-Class-Load-XS.spec b/perl-Class-Load-XS.spec index 49e514a..7478a68 100644 --- a/perl-Class-Load-XS.spec +++ b/perl-Class-Load-XS.spec @@ -1,10 +1,11 @@ Name: perl-Class-Load-XS Version: 0.09 -Release: 7%{?dist} +Release: 8%{?dist} Summary: XS implementation of parts of Class::Load License: Artistic 2.0 URL: http://search.cpan.org/dist/Class-Load-XS/ Source0: http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Class-Load-XS-%{version}.tar.gz +Patch0: 0001-Fix-test-for-Test-Without-Module-0.19.patch # =================================================================== # Module build requirements # =================================================================== @@ -51,6 +52,10 @@ See Class::Load for API details. %prep %setup -q -n Class-Load-XS-%{version} +# Fix test for Test::Without::Module ≥ 0.19 +# https://github.com/moose/Class-Load/pull/2 +%patch0 -p1 + %build perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} @@ -59,7 +64,7 @@ make %{?_smp_mflags} make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -delete find %{buildroot} -type f -name '*.bs' -empty -delete -%{_fixperms} %{buildroot} +%{_fixperms} -c %{buildroot} %check make test @@ -72,6 +77,10 @@ make test %{_mandir}/man3/Class::Load::XS.3* %changelog +* Fri Apr 7 2017 Paul Howarth - 0.09-8 +- Fix FTBFS with Test::Without::Module ≥ 0.19 + (https://github.com/moose/Class-Load/pull/2) + * Sat Feb 11 2017 Fedora Release Engineering - 0.09-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild