diff --git a/Package-Stash-0.28.tar.gz b/Package-Stash-0.28.tar.gz deleted file mode 100644 index d276639..0000000 --- a/Package-Stash-0.28.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:490a859eea23279113dd004aa084c64984cf368b571fa95337d0e7950d5d6c6c -size 29299 diff --git a/Package-Stash-0.29.tar.gz b/Package-Stash-0.29.tar.gz new file mode 100644 index 0000000..234b764 --- /dev/null +++ b/Package-Stash-0.29.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f4c2de24d70f0b08005543ab34b09c01cbe4fc13da76e03a4a4e5a80f328ab0 +size 29358 diff --git a/perl-Package-Stash-old_Test-More.patch b/perl-Package-Stash-old_Test-More.patch new file mode 100644 index 0000000..3557b2c --- /dev/null +++ b/perl-Package-Stash-old_Test-More.patch @@ -0,0 +1,247 @@ +Index: Package-Stash-0.29/t/01-basic.t +=================================================================== +--- Package-Stash-0.29.orig/t/01-basic.t ++++ Package-Stash-0.29/t/01-basic.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; + + use Package::Stash; +@@ -417,4 +417,4 @@ like(exception { + ); + } + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/02-extension.t +=================================================================== +--- Package-Stash-0.29.orig/t/02-extension.t ++++ Package-Stash-0.29/t/02-extension.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; + + { +@@ -73,4 +73,4 @@ is(exception { + + ok(!defined($Foo::{baz}), '... the %baz slot has still not been created'); + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/03-io.t +=================================================================== +--- Package-Stash-0.29.orig/t/03-io.t ++++ Package-Stash-0.29/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-0.29/t/04-get.t +=================================================================== +--- Package-Stash-0.29.orig/t/04-get.t ++++ Package-Stash-0.29/t/04-get.t +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + + use Package::Stash; + use Scalar::Util; +@@ -183,4 +183,4 @@ use Scalar::Util; + } + } + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/05-isa.t +=================================================================== +--- Package-Stash-0.29.orig/t/05-isa.t ++++ Package-Stash-0.29/t/05-isa.t +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + + use Package::Stash; + +@@ -19,4 +19,4 @@ my @ISA = ('Bar'); + @{$stash->get_or_add_symbol('@ISA')} = @ISA; + isa_ok('Foo', 'Bar'); + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/06-addsub.t +=================================================================== +--- Package-Stash-0.29.orig/t/06-addsub.t ++++ Package-Stash-0.29/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-0.29/t/07-edge-cases.t +=================================================================== +--- Package-Stash-0.29.orig/t/07-edge-cases.t ++++ Package-Stash-0.29/t/07-edge-cases.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; + + use Package::Stash; +@@ -81,4 +81,4 @@ use_ok('CompileTime'); + ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted"); + } + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/10-synopsis.t +=================================================================== +--- Package-Stash-0.29.orig/t/10-synopsis.t ++++ Package-Stash-0.29/t/10-synopsis.t +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More qw(no_plan); + + use Package::Stash; + +@@ -16,4 +16,4 @@ ok(!$stash->has_symbol('$foo'), "doesn't + my $namespace = $stash->namespace; + is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly"); + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/impl-selection/01-choice.t +=================================================================== +--- Package-Stash-0.29.orig/t/impl-selection/01-choice.t ++++ Package-Stash-0.29/t/impl-selection/01-choice.t +@@ -1,7 +1,7 @@ + #!/usr/bin/env perl + use strict; + use warnings; +-use Test::More; ++use Test::More qw(no_plan); + + my $has_xs = eval "require Package::Stash::XS; 1"; + +@@ -14,4 +14,4 @@ is($Package::Stash::IMPLEMENTATION, $exp + "autodetected properly: $expected"); + can_ok('Package::Stash', 'new'); + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/impl-selection/02-env.t +=================================================================== +--- Package-Stash-0.29.orig/t/impl-selection/02-env.t ++++ Package-Stash-0.29/t/impl-selection/02-env.t +@@ -1,7 +1,7 @@ + #!/usr/bin/env perl + use strict; + use warnings; +-use Test::More; ++use Test::More qw(no_plan); + + # XXX: work around dumb core segfault bug when you delete stashes + sub get_impl { eval '$Package::Stash::IMPLEMENTATION' } +@@ -26,4 +26,4 @@ SKIP: { + can_ok('Package::Stash', 'new'); + } + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/impl-selection/03-var.t +=================================================================== +--- Package-Stash-0.29.orig/t/impl-selection/03-var.t ++++ Package-Stash-0.29/t/impl-selection/03-var.t +@@ -1,7 +1,7 @@ + #!/usr/bin/env perl + use strict; + use warnings; +-use Test::More; ++use Test::More qw(no_plan); + + # XXX: work around dumb core segfault bug when you delete stashes + sub get_impl { eval '$Package::Stash::IMPLEMENTATION' } +@@ -26,4 +26,4 @@ SKIP: { + can_ok('Package::Stash', 'new'); + } + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/impl-selection/10-basic-pp.t +=================================================================== +--- Package-Stash-0.29.orig/t/impl-selection/10-basic-pp.t ++++ Package-Stash-0.29/t/impl-selection/10-basic-pp.t +@@ -1,7 +1,7 @@ + #!/usr/bin/env perl + use strict; + use warnings; +-use Test::More; ++use Test::More qw(no_plan); + use Test::Fatal; + + BEGIN { $Package::Stash::IMPLEMENTATION = 'PP' } +@@ -421,4 +421,4 @@ like(exception { + ); + } + +-done_testing; ++#done_testing; +Index: Package-Stash-0.29/t/impl-selection/11-basic-xs.t +=================================================================== +--- Package-Stash-0.29.orig/t/impl-selection/11-basic-xs.t ++++ Package-Stash-0.29/t/impl-selection/11-basic-xs.t +@@ -1,7 +1,7 @@ + #!/usr/bin/env perl + use strict; + use warnings; +-use Test::More; ++use Test::More qw(no_plan); + use Test::Fatal; + use Test::Requires 'Package::Stash::XS'; + +@@ -422,4 +422,4 @@ like(exception { + ); + } + +-done_testing; ++#done_testing; diff --git a/perl-Package-Stash.changes b/perl-Package-Stash.changes index bdf944e..98fd2c5 100644 --- a/perl-Package-Stash.changes +++ b/perl-Package-Stash.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jun 4 18:54:22 UTC 2011 - lars@linux-schulserver.de + +- update to 0.29, see Changes: + + no, *really* skip the package-stash-conflict script +- fix build on distributions with old Test::More module + ( perl-Package-Stash-old_Test-More.patch ) +- files in /usr/bin should be executable + ------------------------------------------------------------------- Thu Mar 31 08:10:57 UTC 2011 - coolo@novell.com diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec index 54537eb..6023965 100644 --- a/perl-Package-Stash.spec +++ b/perl-Package-Stash.spec @@ -18,15 +18,16 @@ Name: perl-Package-Stash -Version: 0.28 +Version: 0.29 Release: 1 License: GPL+ or Artistic %define cpan_name Package-Stash -Summary: routines for manipulating stashes +Summary: Routines for manipulating stashes Url: http://search.cpan.org/dist/Package-Stash/ Group: Development/Libraries/Perl #Source: http://www.cpan.org/authors/id/D/DO/DOY/Package-Stash-%{version}.tar.gz Source: %{cpan_name}-%{version}.tar.gz +Patch1: perl-Package-Stash-old_Test-More.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -62,6 +63,10 @@ implementation if possible, falling back to the pure perl one. %prep %setup -q -n %{cpan_name}-%{version} +%if 0%{?suse_version} <= 1110 +%patch1 -p1 +rm t/05-isa.t +%endif %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -81,5 +86,6 @@ implementation if possible, falling back to the pure perl one. %files -f %{name}.files %defattr(644,root,root,755) %doc Changes LICENSE README weaver.ini +%attr(0755,root,root) %{_bindir}/* %changelog