From be516026b4f5580d1a91e0a9043c20987dc9789b Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Feb 10 2012 11:37:09 +0000 Subject: Update to 0.05 - New upstream release 0.05 - Make Test::Taint an optional dependency; it requires XS, and requiring a compiler for Module::Implementation defeats its purpose (CPAN RT#74817) - BR: perl(Test::Requires) - Update patch for building with old Test::More versions --- diff --git a/Module-Implementation-0.04-old-Test::More.patch b/Module-Implementation-0.04-old-Test::More.patch deleted file mode 100644 index 88a7e7f..0000000 --- a/Module-Implementation-0.04-old-Test::More.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -up Module-Implementation-0.04/t/basic.t.orig Module-Implementation-0.04/t/basic.t ---- Module-Implementation-0.04/t/basic.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/basic.t 2012-02-09 10:22:08.974938764 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 5; - - { - package T; -@@ -33,5 +33,3 @@ use Test::More 0.88; - 'T::_implementation returns default implementation' - ); - } -- --done_testing(); -diff -up Module-Implementation-0.04/t/both-fail.t.orig Module-Implementation-0.04/t/both-fail.t ---- Module-Implementation-0.04/t/both-fail.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/both-fail.t 2012-02-09 10:20:58.979107010 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 1; - use Test::Fatal; - - { -@@ -24,5 +24,3 @@ use Test::Fatal; - 'Got an exception when all implementations fail to load' - ); - } -- --done_testing(); -diff -up Module-Implementation-0.04/t/env-value.t.orig Module-Implementation-0.04/t/env-value.t ---- Module-Implementation-0.04/t/env-value.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/env-value.t 2012-02-09 10:22:22.078917410 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 4; - - { - package T; -@@ -35,5 +35,3 @@ use Test::More 0.88; - 'T::_implementation returns implementation set in ENV' - ); - } -- --done_testing(); -diff -up Module-Implementation-0.04/t/more-symbols.t.orig Module-Implementation-0.04/t/more-symbols.t ---- Module-Implementation-0.04/t/more-symbols.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/more-symbols.t 2012-02-09 10:20:58.980107009 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 7; - - { - package T; -@@ -43,5 +43,3 @@ use Test::More 0.88; - '%T::HASH was copied from implementation' - ); - } -- --done_testing(); -diff -up Module-Implementation-0.04/t/one-impl-fails1.t.orig Module-Implementation-0.04/t/one-impl-fails1.t ---- Module-Implementation-0.04/t/one-impl-fails1.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/one-impl-fails1.t 2012-02-09 10:20:58.980107009 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 2; - - { - package T; -@@ -24,5 +24,3 @@ use Test::More 0.88; - ok( T->can('return_42'), 'T package has a return_42 sub' ); - ok( !T->can('return_package'), 'T package has a return_package sub' ); - } -- --done_testing(); -diff -up Module-Implementation-0.04/t/one-impl-fails2.t.orig Module-Implementation-0.04/t/one-impl-fails2.t ---- Module-Implementation-0.04/t/one-impl-fails2.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/one-impl-fails2.t 2012-02-09 10:20:58.980107009 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 2; - - { - package T; -@@ -24,5 +24,3 @@ use Test::More 0.88; - ok( T->can('return_42'), 'T package has a return_42 sub' ); - ok( !T->can('return_package'), 'T package has a return_package sub' ); - } -- --done_testing(); -diff -up Module-Implementation-0.04/t/release-cpan-changes.t.orig Module-Implementation-0.04/t/release-cpan-changes.t ---- Module-Implementation-0.04/t/release-cpan-changes.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/release-cpan-changes.t 2012-02-09 10:20:58.980107009 +0000 -@@ -1,15 +1,11 @@ - #!perl - -+use Test::More; -+ - BEGIN { -- unless ($ENV{RELEASE_TESTING}) { -- require Test::More; -- Test::More::plan(skip_all => 'these tests are for release candidate testing'); -- } -+ plan skip_all => 'these tests are for release candidate testing' unless ($ENV{RELEASE_TESTING}); -+ eval 'use Test::CPAN::Changes'; -+ plan skip_all => 'Test::CPAN::Changes required for this test' if $@; - } - -- --use Test::More; --eval 'use Test::CPAN::Changes'; --plan skip_all => 'Test::CPAN::Changes required for this test' if $@; - changes_ok(); --done_testing(); -diff -up Module-Implementation-0.04/t/requested-fails.t.orig Module-Implementation-0.04/t/requested-fails.t ---- Module-Implementation-0.04/t/requested-fails.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/requested-fails.t 2012-02-09 10:20:58.980107009 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 1; - use Test::Fatal; - - { -@@ -26,5 +26,3 @@ use Test::Fatal; - 'Got an exception when implementation requested in env value fails to load' - ); - } -- --done_testing(); -diff -up Module-Implementation-0.04/t/taint.t.orig Module-Implementation-0.04/t/taint.t ---- Module-Implementation-0.04/t/taint.t.orig 2012-02-08 19:43:09.000000000 +0000 -+++ Module-Implementation-0.04/t/taint.t 2012-02-09 10:22:36.326894194 +0000 -@@ -3,7 +3,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 3; - use Test::Fatal; - use Test::Taint; - -@@ -39,5 +39,3 @@ taint_checking_ok(); - 'T::_implementation returns implementation set in ENV' - ); - } -- --done_testing(); diff --git a/Module-Implementation-0.05-old-Test::More.patch b/Module-Implementation-0.05-old-Test::More.patch new file mode 100644 index 0000000..5d7fb41 --- /dev/null +++ b/Module-Implementation-0.05-old-Test::More.patch @@ -0,0 +1,168 @@ +diff -up Module-Implementation-0.05/t/basic.t.orig Module-Implementation-0.05/t/basic.t +--- Module-Implementation-0.05/t/basic.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/basic.t 2012-02-10 10:53:07.453271294 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 5; + + { + package T; +@@ -33,5 +33,3 @@ use Test::More 0.88; + 'T::_implementation returns default implementation' + ); + } +- +-done_testing(); +diff -up Module-Implementation-0.05/t/both-fail.t.orig Module-Implementation-0.05/t/both-fail.t +--- Module-Implementation-0.05/t/both-fail.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/both-fail.t 2012-02-10 10:53:07.461271306 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 1; + use Test::Fatal; + + { +@@ -24,5 +24,3 @@ use Test::Fatal; + 'Got an exception when all implementations fail to load' + ); + } +- +-done_testing(); +diff -up Module-Implementation-0.05/t/env-value.t.orig Module-Implementation-0.05/t/env-value.t +--- Module-Implementation-0.05/t/env-value.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/env-value.t 2012-02-10 10:53:07.462271308 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 4; + + { + package T; +@@ -35,5 +35,3 @@ use Test::More 0.88; + 'T::_implementation returns implementation set in ENV' + ); + } +- +-done_testing(); +diff -up Module-Implementation-0.05/t/more-symbols.t.orig Module-Implementation-0.05/t/more-symbols.t +--- Module-Implementation-0.05/t/more-symbols.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/more-symbols.t 2012-02-10 10:53:07.462271308 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 7; + + { + package T; +@@ -43,5 +43,3 @@ use Test::More 0.88; + '%T::HASH was copied from implementation' + ); + } +- +-done_testing(); +diff -up Module-Implementation-0.05/t/one-impl-fails1.t.orig Module-Implementation-0.05/t/one-impl-fails1.t +--- Module-Implementation-0.05/t/one-impl-fails1.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/one-impl-fails1.t 2012-02-10 10:53:07.462271308 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 2; + + { + package T; +@@ -24,5 +24,3 @@ use Test::More 0.88; + ok( T->can('return_42'), 'T package has a return_42 sub' ); + ok( !T->can('return_package'), 'T package has a return_package sub' ); + } +- +-done_testing(); +diff -up Module-Implementation-0.05/t/one-impl-fails2.t.orig Module-Implementation-0.05/t/one-impl-fails2.t +--- Module-Implementation-0.05/t/one-impl-fails2.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/one-impl-fails2.t 2012-02-10 10:53:07.463271310 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 2; + + { + package T; +@@ -24,5 +24,3 @@ use Test::More 0.88; + ok( T->can('return_42'), 'T package has a return_42 sub' ); + ok( !T->can('return_package'), 'T package has a return_package sub' ); + } +- +-done_testing(); +diff -up Module-Implementation-0.05/t/release-cpan-changes.t.orig Module-Implementation-0.05/t/release-cpan-changes.t +--- Module-Implementation-0.05/t/release-cpan-changes.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/release-cpan-changes.t 2012-02-10 10:53:07.463271310 +0000 +@@ -1,15 +1,11 @@ + #!perl + ++use Test::More; ++ + BEGIN { +- unless ($ENV{RELEASE_TESTING}) { +- require Test::More; +- Test::More::plan(skip_all => 'these tests are for release candidate testing'); +- } ++ plan skip_all => 'these tests are for release candidate testing' unless ($ENV{RELEASE_TESTING}); ++ eval 'use Test::CPAN::Changes'; ++ plan skip_all => 'Test::CPAN::Changes required for this test' if $@; + } + +- +-use Test::More; +-eval 'use Test::CPAN::Changes'; +-plan skip_all => 'Test::CPAN::Changes required for this test' if $@; + changes_ok(); +-done_testing(); +diff -up Module-Implementation-0.05/t/requested-fails.t.orig Module-Implementation-0.05/t/requested-fails.t +--- Module-Implementation-0.05/t/requested-fails.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/requested-fails.t 2012-02-10 10:53:07.463271310 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 1; + use Test::Fatal; + + { +@@ -26,5 +26,3 @@ use Test::Fatal; + 'Got an exception when implementation requested in env value fails to load' + ); + } +- +-done_testing(); +diff -up Module-Implementation-0.05/t/taint.t.orig Module-Implementation-0.05/t/taint.t +--- Module-Implementation-0.05/t/taint.t.orig 2012-02-09 14:49:29.000000000 +0000 ++++ Module-Implementation-0.05/t/taint.t 2012-02-10 10:53:42.164322515 +0000 +@@ -7,7 +7,7 @@ use Test::Requires { + 'Test::Taint' => '0', + }; + +-use Test::More 0.88; ++use Test::More tests => 3; + use Test::Fatal; + + taint_checking_ok(); +@@ -42,5 +42,3 @@ taint_checking_ok(); + 'T::_implementation returns implementation set in ENV' + ); + } +- +-done_testing(); diff --git a/perl-Module-Implementation.spec b/perl-Module-Implementation.spec index 03d102e..9c38bfb 100644 --- a/perl-Module-Implementation.spec +++ b/perl-Module-Implementation.spec @@ -8,14 +8,14 @@ #TODO: BR: Test::Pod::LinkCheck when available Name: perl-Module-Implementation -Version: 0.04 +Version: 0.05 Release: 1%{?dist} Summary: Loads one of several alternate underlying implementations for a module Group: Development/Libraries License: Artistic 2.0 URL: http://search.cpan.org/dist/perl-Module-Implementation/ Source0: http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Module-Implementation-%{version}.tar.gz -Patch1: Module-Implementation-0.04-old-Test::More.patch +Patch1: Module-Implementation-0.05-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch # =================================================================== @@ -36,6 +36,7 @@ BuildRequires: perl(warnings) BuildRequires: perl(lib) BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Requires) BuildRequires: perl(Test::Taint) # =================================================================== # Author/Release test requirements @@ -96,6 +97,13 @@ rm -rf %{buildroot} %{_mandir}/man3/Module::Implementation.3pm* %changelog +* Fri Feb 10 2012 Paul Howarth - 0.05-1 +- Update to 0.05 + - Make Test::Taint an optional dependency; it requires XS, and requiring a + compiler for Module::Implementation defeats its purpose (CPAN RT#74817) +- BR: perl(Test::Requires) +- Update patch for building with old Test::More versions + * Thu Feb 9 2012 Paul Howarth - 0.04-1 - Update to 0.04 - This module no longer installs an _implementation() subroutine in callers; diff --git a/sources b/sources index 24a785e..31507b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b9d92c4f2a4507a6a4002926259f2ed8 Module-Implementation-0.04.tar.gz +50309f29d5cef82071960fec7be17e60 Module-Implementation-0.05.tar.gz