From 24f567461dbd72d3405842437c014345a2cad125b7f1c90d67a40d9977dabfb3 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 17:45:48 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/perl-Package-Stash-XS revision 7.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Package-Stash-XS?expand=0&rev=eea84e2edb28dd708e1788a981c4d0f3 --- perl-Package-Stash-XS.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-Package-Stash-XS.spec b/perl-Package-Stash-XS.spec index 78a509c..72b9081 100644 --- a/perl-Package-Stash-XS.spec +++ b/perl-Package-Stash-XS.spec @@ -20,7 +20,7 @@ Name: perl-Package-Stash-XS Version: 0.25 Release: 1 -License: GPL+ or Artistic +License: GPL-1.0+ or Artistic-1.0 %define cpan_name Package-Stash-XS Summary: faster and more correct implementation of the Package::Stash API Url: http://search.cpan.org/dist/Package-Stash-XS/ From 26de6cd1715039c1bd10e486949a3b75311d5f1fd085b6d121f69cc1d98e24f9 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Wed, 29 Feb 2012 14:54:25 +0000 Subject: [PATCH 2/2] - make it build again with old Test::More OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Package-Stash-XS?expand=0&rev=6 --- perl-Package-Stash-XS-old_Test-More.patch | 296 +++++++++++++++++----- perl-Package-Stash-XS.changes | 5 + perl-Package-Stash-XS.spec | 13 +- 3 files changed, 237 insertions(+), 77 deletions(-) diff --git a/perl-Package-Stash-XS-old_Test-More.patch b/perl-Package-Stash-XS-old_Test-More.patch index 9b6e46e..b24bdcd 100644 --- a/perl-Package-Stash-XS-old_Test-More.patch +++ b/perl-Package-Stash-XS-old_Test-More.patch @@ -1,7 +1,72 @@ -Index: Package-Stash-XS-0.22/t/01-basic.t -=================================================================== ---- Package-Stash-XS-0.22.orig/t/01-basic.t -+++ Package-Stash-XS-0.22/t/01-basic.t +diff -urN t.old/00-compile.t t/00-compile.t +--- t.old/00-compile.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/00-compile.t 2012-02-29 15:42:58.937740000 +0100 +@@ -3,7 +3,7 @@ + use strict; + use warnings; + +-use Test::More; ++use Test::More qw(no_plan); + + + +diff -urN t.old/addsub.t t/addsub.t +--- t.old/addsub.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/addsub.t 2012-02-29 15:42:58.952742000 +0100 +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + use Test::Fatal; + + BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE +@@ -43,4 +43,4 @@ + is $DB::sub{'Foo::dunk'}, sprintf "%s:%d-%d", "FileName", 100, 199, + '... got the right %DB::sub value for dunk with specified args'; + +-done_testing; ++#done_testing; +diff -urN t.old/author-leaks-debug.t t/author-leaks-debug.t +--- t.old/author-leaks-debug.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/author-leaks-debug.t 2012-02-29 15:42:58.968740000 +0100 +@@ -10,7 +10,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + use Test::Fatal; + use Test::LeakTrace; + +@@ -209,4 +209,4 @@ + } "doesn't leak on errors"; + } + +-done_testing; ++#done_testing; +diff -urN t.old/author-leaks.t t/author-leaks.t +--- t.old/author-leaks.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/author-leaks.t 2012-02-29 15:42:58.984740000 +0100 +@@ -10,7 +10,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + use Test::Fatal; + use Test::LeakTrace; + +@@ -207,4 +207,4 @@ + } "doesn't leak on errors"; + } + +-done_testing; ++#done_testing; +diff -urN t.old/basic.t t/basic.t +--- t.old/basic.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/basic.t 2012-02-29 15:42:59.001744000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -11,16 +76,47 @@ Index: Package-Stash-XS-0.22/t/01-basic.t use Test::Fatal; use Package::Stash; -@@ -417,4 +417,4 @@ like(exception { - ); - } +@@ -437,4 +437,4 @@ + "module name must be a string" + ); -done_testing; +#done_testing; -Index: Package-Stash-XS-0.22/t/02-extension.t -=================================================================== ---- Package-Stash-XS-0.22.orig/t/02-extension.t -+++ Package-Stash-XS-0.22/t/02-extension.t +diff -urN t.old/compile-time.t t/compile-time.t +--- t.old/compile-time.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/compile-time.t 2012-02-29 15:42:59.015741000 +0100 +@@ -2,8 +2,8 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + + use_ok('CompileTime'); + +-done_testing; ++#done_testing; +diff -urN t.old/edge-cases.t t/edge-cases.t +--- t.old/edge-cases.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/edge-cases.t 2012-02-29 15:42:59.029743000 +0100 +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + use Test::Fatal; + + use Package::Stash; +@@ -53,4 +53,4 @@ + is(ref($stash->get_symbol('$glob')), '', "nothing yet"); + is(ref($stash->get_or_add_symbol('$glob')), 'SCALAR', "got an empty scalar"); + +-done_testing; ++#done_testing; +diff -urN t.old/extension.t t/extension.t +--- t.old/extension.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/extension.t 2012-02-29 15:42:59.044740000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -30,35 +126,15 @@ Index: Package-Stash-XS-0.22/t/02-extension.t use Test::Fatal; { -@@ -73,4 +73,4 @@ is(exception { +@@ -73,4 +73,4 @@ ok(!defined($Foo::{baz}), '... the %baz slot has still not been created'); -done_testing; +#done_testing; -Index: Package-Stash-XS-0.22/t/03-io.t -=================================================================== ---- Package-Stash-XS-0.22.orig/t/03-io.t -+++ Package-Stash-XS-0.22/t/03-io.t -@@ -2,7 +2,7 @@ - use strict; - use warnings; - use lib 't/lib'; --use Test::More; -+use Test::More qw(no_plan); - use Test::Fatal; - - { -@@ -48,4 +48,4 @@ use Package::Stash; - is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz"); - } - --done_testing; -+#done_testing; -Index: Package-Stash-XS-0.22/t/04-get.t -=================================================================== ---- Package-Stash-XS-0.22.orig/t/04-get.t -+++ Package-Stash-XS-0.22/t/04-get.t +diff -urN t.old/get.t t/get.t +--- t.old/get.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/get.t 2012-02-29 15:42:59.059740000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -68,16 +144,33 @@ Index: Package-Stash-XS-0.22/t/04-get.t use Package::Stash; use Scalar::Util; -@@ -183,4 +183,4 @@ use Scalar::Util; +@@ -183,4 +183,4 @@ } } -done_testing; +#done_testing; -Index: Package-Stash-XS-0.22/t/05-isa.t -=================================================================== ---- Package-Stash-XS-0.22.orig/t/05-isa.t -+++ Package-Stash-XS-0.22/t/05-isa.t +diff -urN t.old/io.t t/io.t +--- t.old/io.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/io.t 2012-02-29 15:42:59.073742000 +0100 +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + use Test::Fatal; + + { +@@ -48,4 +48,4 @@ + is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz"); + } + +-done_testing; ++#done_testing; +diff -urN t.old/isa.t t/isa.t +--- t.old/isa.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/isa.t 2012-02-29 15:42:59.109744000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -87,35 +180,15 @@ Index: Package-Stash-XS-0.22/t/05-isa.t use Package::Stash; -@@ -19,4 +19,4 @@ my @ISA = ('Bar'); +@@ -19,4 +19,4 @@ @{$stash->get_or_add_symbol('@ISA')} = @ISA; isa_ok('Foo', 'Bar'); -done_testing; +#done_testing; -Index: Package-Stash-XS-0.22/t/06-addsub.t -=================================================================== ---- Package-Stash-XS-0.22.orig/t/06-addsub.t -+++ Package-Stash-XS-0.22/t/06-addsub.t -@@ -2,7 +2,7 @@ - use strict; - use warnings; - use lib 't/lib'; --use Test::More; -+use Test::More qw(no_plan); - use Test::Fatal; - - BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE -@@ -43,4 +43,4 @@ $foo_stash->add_symbol( - is $DB::sub{'Foo::dunk'}, sprintf "%s:%d-%d", "FileName", 100, 199, - '... got the right %DB::sub value for dunk with specified args'; - --done_testing; -+#done_testing; -Index: Package-Stash-XS-0.22/t/07-edge-cases.t -=================================================================== ---- Package-Stash-XS-0.22.orig/t/07-edge-cases.t -+++ Package-Stash-XS-0.22/t/07-edge-cases.t +diff -urN t.old/paamayim_nekdotayim.t t/paamayim_nekdotayim.t +--- t.old/paamayim_nekdotayim.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/paamayim_nekdotayim.t 2012-02-29 15:42:59.122742000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -125,16 +198,99 @@ Index: Package-Stash-XS-0.22/t/07-edge-cases.t use Test::Fatal; use Package::Stash; -@@ -81,4 +81,4 @@ use_ok('CompileTime'); +@@ -25,4 +25,4 @@ + "can't add symbol with ::" + ); + +-done_testing; ++#done_testing; +diff -urN t.old/release-eol.t t/release-eol.t +--- t.old/release-eol.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/release-eol.t 2012-02-29 15:42:59.136743000 +0100 +@@ -8,7 +8,7 @@ + + use strict; + use warnings; +-use Test::More; ++use Test::More qw(no_plan); + + eval 'use Test::EOL'; + plan skip_all => 'Test::EOL required' if $@; +diff -urN t.old/release-no-tabs.t t/release-no-tabs.t +--- t.old/release-no-tabs.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/release-no-tabs.t 2012-02-29 15:42:59.150740000 +0100 +@@ -8,7 +8,7 @@ + + use strict; + use warnings; +-use Test::More; ++use Test::More qw(no_plan); + + eval 'use Test::NoTabs'; + plan skip_all => 'Test::NoTabs required' if $@; +diff -urN t.old/release-pod-coverage.t t/release-pod-coverage.t +--- t.old/release-pod-coverage.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/release-pod-coverage.t 2012-02-29 15:42:59.164740000 +0100 +@@ -8,7 +8,7 @@ + } + + +-use Test::More; ++use Test::More qw(no_plan); + + eval "use Test::Pod::Coverage 1.08"; + plan skip_all => "Test::Pod::Coverage 1.08 required for testing POD coverage" +diff -urN t.old/release-pod-syntax.t t/release-pod-syntax.t +--- t.old/release-pod-syntax.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/release-pod-syntax.t 2012-02-29 15:42:59.178741000 +0100 +@@ -7,7 +7,7 @@ + } + } + +-use Test::More; ++use Test::More qw(no_plan); + + eval "use Test::Pod 1.41"; + plan skip_all => "Test::Pod 1.41 required for testing POD" if $@; +diff -urN t.old/scalar-values.t t/scalar-values.t +--- t.old/scalar-values.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/scalar-values.t 2012-02-29 15:42:59.192741000 +0100 +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + use Test::Fatal; + + use B; +@@ -50,4 +50,4 @@ + is(exception { $Bar->add_symbol('$vstring', \$vstring) }, undef, + "can add vstring values"); + +-done_testing; ++#done_testing; +diff -urN t.old/stash-deletion.t t/stash-deletion.t +--- t.old/stash-deletion.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/stash-deletion.t 2012-02-29 15:42:59.206741000 +0100 +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + + use Package::Stash; + +@@ -21,4 +21,4 @@ ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted"); } -done_testing; +#done_testing; -Index: Package-Stash-XS-0.22/t/10-synopsis.t -=================================================================== ---- Package-Stash-XS-0.22.orig/t/10-synopsis.t -+++ Package-Stash-XS-0.22/t/10-synopsis.t +diff -urN t.old/synopsis.t t/synopsis.t +--- t.old/synopsis.t 2011-09-06 16:28:21.000000000 +0200 ++++ t/synopsis.t 2012-02-29 15:42:59.221740000 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -144,7 +300,7 @@ Index: Package-Stash-XS-0.22/t/10-synopsis.t use Package::Stash; -@@ -16,4 +16,4 @@ ok(!$stash->has_symbol('$foo'), "doesn't +@@ -16,4 +16,4 @@ my $namespace = $stash->namespace; is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly"); diff --git a/perl-Package-Stash-XS.changes b/perl-Package-Stash-XS.changes index 03e7d34..dc5b71a 100644 --- a/perl-Package-Stash-XS.changes +++ b/perl-Package-Stash-XS.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 29 15:53:58 CET 2012 - ro@suse.de + +- make it build again with old Test::More + ------------------------------------------------------------------- Wed Oct 26 17:55:03 UTC 2011 - tabraham@novell.com diff --git a/perl-Package-Stash-XS.spec b/perl-Package-Stash-XS.spec index 72b9081..422d385 100644 --- a/perl-Package-Stash-XS.spec +++ b/perl-Package-Stash-XS.spec @@ -1,7 +1,7 @@ # # spec file for package perl-Package-Stash-XS # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,14 @@ # - Name: perl-Package-Stash-XS Version: 0.25 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Release: 0 %define cpan_name Package-Stash-XS Summary: faster and more correct implementation of the Package::Stash API -Url: http://search.cpan.org/dist/Package-Stash-XS/ +License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/Package-Stash-XS/ Source: http://www.cpan.org/authors/id/D/DO/DOY/%{cpan_name}-%{version}.tar.gz Patch1: perl-Package-Stash-XS-old_Test-More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -57,8 +56,8 @@ with a compiler. %setup -q -n %{cpan_name}-%{version} find . -type f -print0 | xargs -0 chmod 644 %if 0%{?suse_version} <= 1110 -%patch1 -p1 -rm t/05-isa.t +%patch1 -p0 +rm -f t/00-compile.t t/isa.t %endif %build