diff --git a/namespace-clean-0.22-old-Test::More.patch b/namespace-clean-0.22-old-Test::More.patch deleted file mode 100644 index 9a63b71..0000000 --- a/namespace-clean-0.22-old-Test::More.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -up namespace-clean-0.22/t/07-debugger.t.orig namespace-clean-0.22/t/07-debugger.t ---- namespace-clean-0.22/t/07-debugger.t.orig 2011-12-21 09:50:20.000000000 +0000 -+++ namespace-clean-0.22/t/07-debugger.t 2011-12-27 12:15:04.039679744 +0000 -@@ -17,6 +17,8 @@ BEGIN { - - } - -+plan tests => 4; -+ - { - package Foo; - -@@ -35,5 +37,3 @@ ok( !Foo->can("foo"), "foo cleaned up" ) - ok( !Foo->can("baz"), "baz cleaned up" ); - - Foo->bar(); -- --done_testing; -diff -up namespace-clean-0.22/t/08-const-sub.t.orig namespace-clean-0.22/t/08-const-sub.t ---- namespace-clean-0.22/t/08-const-sub.t.orig 2011-03-29 22:44:20.000000000 +0100 -+++ namespace-clean-0.22/t/08-const-sub.t 2011-12-27 12:15:04.052679751 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 2; - - use constant CONST => 123; - use namespace::clean; -@@ -10,5 +10,3 @@ my $x = CONST; - is $x, 123; - - ok eval("!defined(&CONST)"); -- --done_testing; -diff -up namespace-clean-0.22/t/09-fiddle-hinthash.t.orig namespace-clean-0.22/t/09-fiddle-hinthash.t ---- namespace-clean-0.22/t/09-fiddle-hinthash.t.orig 2011-12-22 11:07:06.000000000 +0000 -+++ namespace-clean-0.22/t/09-fiddle-hinthash.t 2011-12-27 12:15:43.780700500 +0000 -@@ -1,7 +1,7 @@ - use strict; - use warnings; - --use Test::More 0.88; -+use Test::More tests => 4; - - { - package Bar; -@@ -49,5 +49,3 @@ use Test::More 0.88; - } - } - -- --done_testing; -diff -up namespace-clean-0.22/t/10-pure-perl.t.orig namespace-clean-0.22/t/10-pure-perl.t ---- namespace-clean-0.22/t/10-pure-perl.t.orig 2011-12-22 11:20:21.000000000 +0000 -+++ namespace-clean-0.22/t/10-pure-perl.t 2011-12-27 12:16:46.394733202 +0000 -@@ -8,6 +8,8 @@ plan skip_all => "PP tests already execu - eval { require B::Hooks::EndOfScope } - or plan skip_all => "PP tests already executed"; - -+plan tests => 11; -+ - # the PP tests will run either wih D::H (mainly on smokers) - # or by setting the envvar (for users) - my $has_d_h = eval { require Devel::Hide }; -@@ -45,5 +47,3 @@ for my $fn (glob("$Bin/*.t")) { - wait; - ok (! $?, "Exit $? from: @cmd"); - } -- --done_testing; diff --git a/namespace-clean-0.24-old-Test::More.patch b/namespace-clean-0.24-old-Test::More.patch new file mode 100644 index 0000000..3a3b650 --- /dev/null +++ b/namespace-clean-0.24-old-Test::More.patch @@ -0,0 +1,72 @@ +diff -up ./t/07-debugger.t.orig ./t/07-debugger.t +--- ./t/07-debugger.t.orig 2012-11-26 18:47:12.000000000 +0000 ++++ ./t/07-debugger.t 2012-12-05 15:16:36.658012218 +0000 +@@ -26,6 +26,8 @@ BEGIN { + + } + ++plan tests => 4; ++ + { + package Foo; + +@@ -44,5 +46,3 @@ ok( !Foo->can("foo"), "foo cleaned up" ) + ok( !Foo->can("baz"), "baz cleaned up" ); + + Foo->bar(); +- +-done_testing; +diff -up ./t/08-const-sub.t.orig ./t/08-const-sub.t +--- ./t/08-const-sub.t.orig 2011-03-29 22:44:20.000000000 +0100 ++++ ./t/08-const-sub.t 2012-12-05 15:16:36.670012221 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 2; + + use constant CONST => 123; + use namespace::clean; +@@ -10,5 +10,3 @@ my $x = CONST; + is $x, 123; + + ok eval("!defined(&CONST)"); +- +-done_testing; +diff -up ./t/09-fiddle-hinthash.t.orig ./t/09-fiddle-hinthash.t +--- ./t/09-fiddle-hinthash.t.orig 2011-12-22 11:07:06.000000000 +0000 ++++ ./t/09-fiddle-hinthash.t 2012-12-05 15:16:36.671012222 +0000 +@@ -1,7 +1,7 @@ + use strict; + use warnings; + +-use Test::More 0.88; ++use Test::More tests => 4; + + { + package Bar; +@@ -49,5 +49,3 @@ use Test::More 0.88; + } + } + +- +-done_testing; +diff -up ./t/10-pure-perl.t.orig ./t/10-pure-perl.t +--- ./t/10-pure-perl.t.orig 2012-11-26 18:47:12.000000000 +0000 ++++ ./t/10-pure-perl.t 2012-12-05 15:17:25.973028700 +0000 +@@ -8,6 +8,8 @@ plan skip_all => "PP tests already execu + eval { require Variable::Magic } + or plan skip_all => "PP tests already executed"; + ++plan tests => 12; ++ + $ENV{B_HOOKS_ENDOFSCOPE_IMPLEMENTATION} = 'PP'; + require B::Hooks::EndOfScope; + ok( ($INC{'B/Hooks/EndOfScope/PP.pm'} && ! $INC{'B/Hooks/EndOfScope/XS.pm'}), +@@ -42,5 +44,3 @@ for my $fn (bsd_glob("$Bin/*.t")) { + wait; + ok (! $?, "Exit $? from: @cmd"); + } +- +-done_testing; diff --git a/perl-namespace-clean.spec b/perl-namespace-clean.spec index f82179c..092a62f 100644 --- a/perl-namespace-clean.spec +++ b/perl-namespace-clean.spec @@ -6,32 +6,34 @@ Name: perl-namespace-clean Summary: Keep your namespace tidy -Version: 0.23 -Release: 3%{?dist} +Version: 0.24 +Release: 1%{?dist} License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/namespace-clean/ Source0: http://search.cpan.org/CPAN/authors/id/R/RI/RIBASUSHI/namespace-clean-%{version}.tar.gz -Patch1: namespace-clean-0.22-old-Test::More.patch +Patch1: namespace-clean-0.24-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch -BuildRequires: perl(B::Hooks::EndOfScope) >= 0.10 +BuildRequires: perl(base) +BuildRequires: perl(B::Hooks::EndOfScope) >= 0.12 BuildRequires: perl(constant) BuildRequires: perl(Devel::Hide) BuildRequires: perl(Exporter) +BuildRequires: perl(ExtUtils::CBuilder) >= 0.27 BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(FindBin) +BuildRequires: perl(lib) BuildRequires: perl(Package::Stash) >= 0.23 +BuildRequires: perl(Sub::Identify) >= 0.04 +BuildRequires: perl(Sub::Name) >= 0.04 BuildRequires: perl(Test::More) BuildRequires: perl(vars) %if %{fixup_rename_sub} -BuildRequires: perl(Sub::Identify) >= 0.04 -BuildRequires: perl(Sub::Name) >= 0.04 Requires: perl(Sub::Identify) >= 0.04 Requires: perl(Sub::Name) >= 0.04 %endif Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) -Requires: perl(B::Hooks::EndOfScope) >= 0.10 +Requires: perl(B::Hooks::EndOfScope) >= 0.12 # Obsolete/Provide old tests subpackage # Can be removed during F19 development cycle @@ -62,12 +64,6 @@ name, but they won't show up as methods on your class or instances. %patch1 -p1 %endif -# The module doesn't try to use Hash::Util::FieldHash with 5.8.x -%if %(perl -e 'print (($] < 5.009_003_1) ? 1 : 0);') -%global perl_reqfilt /bin/sh -c "%{__perl_requires} | sed -e '/^perl(Hash::Util::FieldHash)/d'" -%define __perl_requires %{perl_reqfilt} -%endif - %build perl Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} @@ -90,6 +86,19 @@ rm -rf %{buildroot} %{_mandir}/man3/namespace::clean.3pm* %changelog +* Wed Dec 5 2012 Paul Howarth - 0.24-1 +- Update to 0.24 + - Properly skip debugger test when optional deps not available + - Make sure pure-perl tests pass correctly on space-containing paths + (CPAN RT#77528) + - Remove all the pure-perl fallback code and depend on PP-capable + B::H::EOS 0.12 +- Module no longer attempts to use Hash::Util::FieldHash, so drop filters +- BR: perl(Sub::Identify) and perl(Sub::Name) unconditionally +- BR: perl(base), perl(ExtUtils::CBuilder) and perl(lib) +- Drop BR: perl(FindBin), not dual-lived upstream +- Update patch for building with old Test::More versions + * Fri Jul 20 2012 Fedora Release Engineering - 0.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 1fa1d34..60a3c8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e3276b6642bd10b865b18bf0b943861 namespace-clean-0.23.tar.gz +bb6f2e2bba5f028a0e939cc6f2639fba namespace-clean-0.24.tar.gz