From 75822f69637934e7390e044ee5021eee9a51e58d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:44:26 +0000 Subject: import perl-Module-Load-Conditional-0.54-3.el7 --- diff --git a/SOURCES/Module-Load-Conditional-0.60-Resolve-test-failures-on-v5.16.x.patch b/SOURCES/Module-Load-Conditional-0.60-Resolve-test-failures-on-v5.16.x.patch new file mode 100644 index 0000000..42dce54 --- /dev/null +++ b/SOURCES/Module-Load-Conditional-0.60-Resolve-test-failures-on-v5.16.x.patch @@ -0,0 +1,42 @@ +From 295cb81d953bff3c7311cf5038d061abeb7802d9 Mon Sep 17 00:00:00 2001 +From: Chris 'BinGOs' Williams +Date: Fri, 24 Jan 2014 15:51:43 +0000 +Subject: [PATCH 1/2] Resolve test failures on v5.16.x +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + t/01_Module_Load_Conditional.t | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/t/01_Module_Load_Conditional.t b/t/01_Module_Load_Conditional.t +index 1b8728f..1bfa1a1 100644 +--- a/t/01_Module_Load_Conditional.t ++++ b/t/01_Module_Load_Conditional.t +@@ -281,8 +281,8 @@ SKIP:{ + local $Module::Load::Conditional::CHECK_INC_HASH = 1; + + { package A::B::C::D; +- $A::B::C::D::VERSION = $$; +- $INC{'A/B/C/D.pm'} = $$.$$; ++ $A::B::C::D::VERSION = "$$"; ++ $INC{'A/B/C/D.pm'} = "$$"."$$"; + + ### XXX this is no longer needed with M::Load 0.11_01 + #$INC{'[.A.B.C]D.pm'} = $$.$$ if $^O eq 'VMS'; +@@ -291,8 +291,8 @@ SKIP:{ + my $href = check_install( module => 'A::B::C::D', version => 0 ); + + ok( $href, 'Found package in %INC' ); +- is( $href->{'file'}, $$.$$, ' Found correct file' ); +- is( $href->{'version'}, $$, ' Found correct version' ); ++ is( $href->{'file'}, "$$"."$$", ' Found correct file' ); ++ is( $href->{'version'}, "$$", ' Found correct version' ); + ok( $href->{'uptodate'}, ' Marked as uptodate' ); + ok( can_load( modules => { 'A::B::C::D' => 0 } ), + ' can_load successful' ); +-- +1.9.0 + diff --git a/SPECS/perl-Module-Load-Conditional.spec b/SPECS/perl-Module-Load-Conditional.spec index 0c5ea78..bf63625 100644 --- a/SPECS/perl-Module-Load-Conditional.spec +++ b/SPECS/perl-Module-Load-Conditional.spec @@ -1,11 +1,14 @@ Name: perl-Module-Load-Conditional Version: 0.54 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Looking up module information and loading at run-time License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Module-Load-Conditional/ Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/Module-Load-Conditional-%{version}.tar.gz +# Fix tests to pass with version-0.9907 on perl-5.16.3, in upstream 0.62, +# bug #1093387, +Patch0: Module-Load-Conditional-0.60-Resolve-test-failures-on-v5.16.x.patch BuildArch: noarch BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) @@ -44,6 +47,7 @@ you have installed on your system during run-time. %prep %setup -q -n Module-Load-Conditional-%{version} +%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor @@ -63,6 +67,9 @@ make test %{_mandir}/man3/* %changelog +* Fri May 02 2014 Petr Pisar - 0.54-3 +- Fix tests to pass with version-0.9907 on perl-5.16.3 (bug #1093387) + * Fri Dec 27 2013 Daniel Mach - 0.54-2 - Mass rebuild 2013-12-27