From dc43d56bd11f2408e89b0e3dad759e20733ad9b8 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Fri, 7 Apr 2017 15:51:41 +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 - Fix FTBFS with Test::Without::Module ≥ 0.19 (https://github.com/moose/Class-Load/pull/2) - Drop redundant Group: tag - Simplify find command using -delete --- .rpmlint | 3 +++ ...ix-test-for-Test-Without-Module-0.19.patch | 25 +++++++++++++++++++ perl-Class-Load.spec | 21 ++++++++++++---- 3 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 .rpmlint create mode 100644 0001-Fix-test-for-Test-Without-Module-0.19.patch diff --git a/.rpmlint b/.rpmlint new file mode 100644 index 0000000..6197229 --- /dev/null +++ b/.rpmlint @@ -0,0 +1,3 @@ +from Config import * +addFilter("unexpanded-macro %description -l C %INC"); +addFilter("spelling-error %description -l en_US filename -> "); 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.spec b/perl-Class-Load.spec index 502185e..86bfc04 100644 --- a/perl-Class-Load.spec +++ b/perl-Class-Load.spec @@ -1,15 +1,16 @@ Name: perl-Class-Load Version: 0.23 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A working (require "Class::Name") and more -Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Class-Load/ Source0: http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/Class-Load-%{version}.tar.gz +Patch0: 0001-Fix-test-for-Test-Without-Module-0.19.patch BuildArch: noarch # =================================================================== # Module build requirements # =================================================================== +BuildRequires: coreutils BuildRequires: findutils BuildRequires: make BuildRequires: perl @@ -38,7 +39,7 @@ BuildRequires: perl(CPAN::Meta) >= 2.120900 BuildRequires: perl(File::Spec) BuildRequires: perl(lib) BuildRequires: perl(Test::Fatal) -BuildRequires: perl(Test::More) +BuildRequires: perl(Test::More) >= 0.88 BuildRequires: perl(Test::Requires) BuildRequires: perl(Test::Without::Module) BuildRequires: perl(version) @@ -64,14 +65,18 @@ provide is_class_loaded 'Class::Name'. %prep %setup -q -n Class-Load-%{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 make %{?_smp_mflags} %install make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -exec rm -f {} ';' -%{_fixperms} %{buildroot} +find %{buildroot} -type f -name .packlist -delete +%{_fixperms} -c %{buildroot} %check make test @@ -87,6 +92,12 @@ make test %{_mandir}/man3/Class::Load.3* %changelog +* Fri Apr 7 2017 Paul Howarth - 0.23-6 +- Fix FTBFS with Test::Without::Module ≥ 0.19 + (https://github.com/moose/Class-Load/pull/2) +- Drop redundant Group: tag +- Simplify find command using -delete + * Sat Feb 11 2017 Fedora Release Engineering - 0.23-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild