From f373c63142b97648b0952e48f30294cd8ea93e55 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 23 Sep 2014 14:48:27 +0100 Subject: [PATCH] Update to 0.37 - New upstream release 0.37 - Fix spurious warning in taint mode (GH#12) - Update patch for building with old Test::More versions - No documentation for Package::Stash::Conflicts in this release - Classify buildreqs by usage - Use %license where possible - Don't try to run the extra tests for EL builds as we won't have the dependencies --- ...=> Package-Stash-0.37-old-Test::More.patch | 201 +++++++++--------- perl-Package-Stash.spec | 69 ++++-- sources | 2 +- 3 files changed, 152 insertions(+), 120 deletions(-) rename Package-Stash-0.36-old-Test::More.patch => Package-Stash-0.37-old-Test::More.patch (63%) diff --git a/Package-Stash-0.36-old-Test::More.patch b/Package-Stash-0.37-old-Test::More.patch similarity index 63% rename from Package-Stash-0.36-old-Test::More.patch rename to Package-Stash-0.37-old-Test::More.patch index d4ace0e..06e47ac 100644 --- a/Package-Stash-0.36-old-Test::More.patch +++ b/Package-Stash-0.37-old-Test::More.patch @@ -1,6 +1,5 @@ -diff -up ./t/addsub.t.orig ./t/addsub.t ---- ./t/addsub.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/addsub.t 2013-09-04 10:03:50.247120380 +0100 +--- t/addsub.t ++++ t/addsub.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -16,81 +15,76 @@ diff -up ./t/addsub.t.orig ./t/addsub.t '... got the right %DB::sub value for dunk with specified args'; - -done_testing; -diff -up ./t/anon-basic.t.orig ./t/anon-basic.t ---- ./t/anon-basic.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/anon-basic.t 2013-09-04 10:03:50.248120379 +0100 -@@ -13,6 +13,8 @@ plan skip_all => "Anonymous stashes in P - if $] < 5.014 - && $Package::Stash::IMPLEMENTATION eq 'PP'; +--- t/anon-basic.t ++++ t/anon-basic.t +@@ -16,6 +16,8 @@ BEGIN { + use Test::Requires 'Package::Anon'; + use Symbol; -+plan tests => 10; ++plan tests => 122; + my $Foo = Package::Anon->new('Foo'); $Foo->{SOME_CONSTANT} = \1; -@@ -399,5 +401,3 @@ $Quuux->{quuuux} = -1; +@@ -402,5 +404,3 @@ $Quuux->{quuuux} = -1; is_deeply([Package::Stash->new('Quuux')->list_all_symbols], [], "Quuux:: isn't touched"); - -done_testing; -diff -up ./t/anon.t.orig ./t/anon.t ---- ./t/anon.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/anon.t 2013-09-04 10:03:50.248120379 +0100 -@@ -14,6 +14,8 @@ plan skip_all => "Anonymous stashes in P - if $] < 5.014 - && $Package::Stash::IMPLEMENTATION eq 'PP'; +--- t/anon.t ++++ t/anon.t +@@ -16,6 +16,8 @@ BEGIN { + use Test::Requires 'Package::Anon'; + use Symbol; +plan tests => 7; + my $anon = Package::Anon->new; my $stash = Package::Stash->new($anon); my $obj = $anon->bless({}); -@@ -45,5 +47,3 @@ my $obj = $anon->bless({}); +@@ -47,5 +49,3 @@ my $obj = $anon->bless({}); qr/Undefined subroutine \&__ANON__::baz called/ ); } - -done_testing; -diff -up ./t/bare-anon-basic.t.orig ./t/bare-anon-basic.t ---- ./t/bare-anon-basic.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/bare-anon-basic.t 2013-09-04 10:03:50.248120379 +0100 -@@ -14,6 +14,8 @@ plan skip_all => "Anonymous stashes in P +--- t/bare-anon-basic.t ++++ t/bare-anon-basic.t +@@ -17,6 +17,8 @@ BEGIN { - plan skip_all => "This isn't really going to work yet, probably"; + use Symbol; +plan tests => 10; + my $Foo = {}; $Foo->{SOME_CONSTANT} = \1; -@@ -393,5 +395,3 @@ $Quuux->{quuuux} = -1; +@@ -396,5 +398,3 @@ $Quuux->{quuuux} = -1; is_deeply([Package::Stash->new('Quuux')->list_all_symbols], [], "Quuux:: isn't touched"); - -done_testing; -diff -up ./t/bare-anon.t.orig ./t/bare-anon.t ---- ./t/bare-anon.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/bare-anon.t 2013-09-04 10:03:50.249120378 +0100 -@@ -14,6 +14,8 @@ plan skip_all => "Anonymous stashes in P +--- t/bare-anon.t ++++ t/bare-anon.t +@@ -17,6 +17,8 @@ BEGIN { - plan skip_all => "This isn't really going to work yet, probably"; + use Symbol; +plan tests => 10; + my $anon = {}; my $stash = Package::Stash->new($anon); # no way to bless something into a hashref yet -@@ -58,5 +60,3 @@ my $stash = Package::Stash->new($anon); +@@ -61,5 +63,3 @@ my $stash = Package::Stash->new($anon); undef ); } - -done_testing; -diff -up ./t/basic.t.orig ./t/basic.t ---- ./t/basic.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/basic.t 2013-09-04 10:03:50.249120378 +0100 +--- t/basic.t ++++ t/basic.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -106,9 +100,8 @@ diff -up ./t/basic.t.orig ./t/basic.t ); - -done_testing; -diff -up ./t/compile-time.t.orig ./t/compile-time.t ---- ./t/compile-time.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/compile-time.t 2013-09-04 10:03:50.249120378 +0100 +--- t/compile-time.t ++++ t/compile-time.t @@ -2,8 +2,6 @@ use strict; use warnings; @@ -119,9 +112,8 @@ diff -up ./t/compile-time.t.orig ./t/compile-time.t use_ok('CompileTime'); - -done_testing; -diff -up ./t/edge-cases.t.orig ./t/edge-cases.t ---- ./t/edge-cases.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/edge-cases.t 2013-09-04 10:03:50.250120376 +0100 +--- t/edge-cases.t ++++ t/edge-cases.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -137,9 +129,8 @@ diff -up ./t/edge-cases.t.orig ./t/edge-cases.t } - -done_testing; -diff -up ./t/extension.t.orig ./t/extension.t ---- ./t/extension.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/extension.t 2013-09-04 10:03:50.250120376 +0100 +--- t/extension.t ++++ t/extension.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -155,9 +146,8 @@ diff -up ./t/extension.t.orig ./t/extension.t ok(!defined($Foo::{baz}), '... the %baz slot has still not been created'); - -done_testing; -diff -up ./t/get.t.orig ./t/get.t ---- ./t/get.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/get.t 2013-09-04 10:03:50.250120376 +0100 +--- t/get.t ++++ t/get.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -173,9 +163,8 @@ diff -up ./t/get.t.orig ./t/get.t } - -done_testing; -diff -up ./t/impl-selection/basic-pp.t.orig ./t/impl-selection/basic-pp.t ---- ./t/impl-selection/basic-pp.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/impl-selection/basic-pp.t 2013-09-04 10:03:50.251120375 +0100 +--- t/impl-selection/basic-pp.t ++++ t/impl-selection/basic-pp.t @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -191,9 +180,8 @@ diff -up ./t/impl-selection/basic-pp.t.orig ./t/impl-selection/basic-pp.t ); - -done_testing; -diff -up ./t/impl-selection/basic-xs.t.orig ./t/impl-selection/basic-xs.t ---- ./t/impl-selection/basic-xs.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/impl-selection/basic-xs.t 2013-09-04 10:03:50.251120375 +0100 +--- t/impl-selection/basic-xs.t ++++ t/impl-selection/basic-xs.t @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -209,9 +197,8 @@ diff -up ./t/impl-selection/basic-xs.t.orig ./t/impl-selection/basic-xs.t ); - -done_testing; -diff -up ./t/impl-selection/bug-rt-78272.t.orig ./t/impl-selection/bug-rt-78272.t ---- ./t/impl-selection/bug-rt-78272.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/impl-selection/bug-rt-78272.t 2013-09-04 10:03:50.251120375 +0100 +--- t/impl-selection/bug-rt-78272.t ++++ t/impl-selection/bug-rt-78272.t @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -240,9 +227,8 @@ diff -up ./t/impl-selection/bug-rt-78272.t.orig ./t/impl-selection/bug-rt-78272. -); - -done_testing; -diff -up ./t/impl-selection/choice.t.orig ./t/impl-selection/choice.t ---- ./t/impl-selection/choice.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/impl-selection/choice.t 2013-09-04 10:03:50.252120374 +0100 +--- t/impl-selection/choice.t ++++ t/impl-selection/choice.t @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -258,9 +244,8 @@ diff -up ./t/impl-selection/choice.t.orig ./t/impl-selection/choice.t can_ok('Package::Stash', 'new'); - -done_testing; -diff -up ./t/impl-selection/env.t.orig ./t/impl-selection/env.t ---- ./t/impl-selection/env.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/impl-selection/env.t 2013-09-04 10:03:50.252120374 +0100 +--- t/impl-selection/env.t ++++ t/impl-selection/env.t @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -276,9 +261,8 @@ diff -up ./t/impl-selection/env.t.orig ./t/impl-selection/env.t } - -done_testing; -diff -up ./t/impl-selection/var.t.orig ./t/impl-selection/var.t ---- ./t/impl-selection/var.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/impl-selection/var.t 2013-09-04 10:03:50.252120374 +0100 +--- t/impl-selection/var.t ++++ t/impl-selection/var.t @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -294,9 +278,8 @@ diff -up ./t/impl-selection/var.t.orig ./t/impl-selection/var.t } - -done_testing; -diff -up ./t/io.t.orig ./t/io.t ---- ./t/io.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/io.t 2013-09-04 10:03:50.252120374 +0100 +--- t/io.t ++++ t/io.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -312,9 +295,8 @@ diff -up ./t/io.t.orig ./t/io.t } - -done_testing; -diff -up ./t/isa.t.orig ./t/isa.t ---- ./t/isa.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/isa.t 2013-09-04 10:03:50.253120373 +0100 +--- t/isa.t ++++ t/isa.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -359,9 +341,8 @@ diff -up ./t/isa.t.orig ./t/isa.t } - -done_testing; -diff -up ./t/magic.t.orig ./t/magic.t ---- ./t/magic.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/magic.t 2013-09-04 10:04:56.321041441 +0100 +--- t/magic.t ++++ t/magic.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -376,9 +357,8 @@ diff -up ./t/magic.t.orig ./t/magic.t } -done_testing; -diff -up ./t/paamayim_nekdotayim.t.orig ./t/paamayim_nekdotayim.t ---- ./t/paamayim_nekdotayim.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/paamayim_nekdotayim.t 2013-09-04 10:03:50.253120373 +0100 +--- t/paamayim_nekdotayim.t ++++ t/paamayim_nekdotayim.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -394,9 +374,8 @@ diff -up ./t/paamayim_nekdotayim.t.orig ./t/paamayim_nekdotayim.t ); - -done_testing; -diff -up ./t/scalar-values.t.orig ./t/scalar-values.t ---- ./t/scalar-values.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/scalar-values.t 2013-09-04 10:03:50.254120371 +0100 +--- t/scalar-values.t ++++ t/scalar-values.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -412,9 +391,8 @@ diff -up ./t/scalar-values.t.orig ./t/scalar-values.t "can add vstring values"); - -done_testing; -diff -up ./t/stash-deletion.t.orig ./t/stash-deletion.t ---- ./t/stash-deletion.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/stash-deletion.t 2013-09-04 10:03:50.254120371 +0100 +--- t/stash-deletion.t ++++ t/stash-deletion.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -430,9 +408,8 @@ diff -up ./t/stash-deletion.t.orig ./t/stash-deletion.t } - -done_testing; -diff -up ./t/synopsis.t.orig ./t/synopsis.t ---- ./t/synopsis.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/synopsis.t 2013-09-04 10:03:50.254120371 +0100 +--- t/synopsis.t ++++ t/synopsis.t @@ -2,7 +2,7 @@ use strict; use warnings; @@ -448,27 +425,41 @@ diff -up ./t/synopsis.t.orig ./t/synopsis.t is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly"); - -done_testing; -diff -up ./t/warnings.t.orig ./t/warnings.t ---- ./t/warnings.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./t/warnings.t 2013-09-04 10:05:21.562011163 +0100 -@@ -1,7 +1,7 @@ - #!/usr/bin/env perl +--- t/warnings-taint.t ++++ t/warnings-taint.t +@@ -2,7 +2,7 @@ use strict; use warnings; + use lib 't/lib'; -use Test::More; +use Test::More tests => 1; use Package::Stash; -@@ -17,5 +17,3 @@ BEGIN { +@@ -19,4 +19,3 @@ BEGIN { + + is($warnings, ''); + +-done_testing; +--- t/warnings.t ++++ t/warnings.t +@@ -2,7 +2,7 @@ + use strict; + use warnings; + use lib 't/lib'; +-use Test::More; ++use Test::More tests => 1; + + use Package::Stash; + +@@ -18,5 +18,3 @@ BEGIN { } is($warnings, ''); - -done_testing; -diff -up ./xt/author/leaks-debug.t.orig ./xt/author/leaks-debug.t ---- ./xt/author/leaks-debug.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./xt/author/leaks-debug.t 2013-09-04 10:03:50.255120370 +0100 +--- xt/author/leaks-debug.t ++++ xt/author/leaks-debug.t @@ -6,6 +6,8 @@ use Test::More; use Test::Fatal; use Test::LeakTrace; @@ -495,9 +486,8 @@ diff -up ./xt/author/leaks-debug.t.orig ./xt/author/leaks-debug.t } - -done_testing; -diff -up ./xt/author/leaks.t.orig ./xt/author/leaks.t ---- ./xt/author/leaks.t.orig 2013-09-04 01:29:07.000000000 +0100 -+++ ./xt/author/leaks.t 2013-09-04 10:03:50.255120370 +0100 +--- xt/author/leaks.t ++++ xt/author/leaks.t @@ -6,6 +6,8 @@ use Test::More; use Test::Fatal; use Test::LeakTrace; @@ -524,3 +514,22 @@ diff -up ./xt/author/leaks.t.orig ./xt/author/leaks.t } - -done_testing; +--- xt/release/no-tabs.t ++++ xt/release/no-tabs.t +@@ -3,7 +3,7 @@ use warnings; + + # this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.08 + +-use Test::More 0.88; ++use Test::More; + use Test::NoTabs; + + my @files = ( +@@ -41,5 +41,6 @@ my @files = ( + 't/warnings.t' + ); + ++plan tests => scalar @files; ++ + notabs_ok($_) foreach @files; +-done_testing; diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec index 5f13750..24f3024 100644 --- a/perl-Package-Stash.spec +++ b/perl-Package-Stash.spec @@ -2,47 +2,55 @@ %global old_test_more %(perl -MTest::More -e 'print (($Test::More::VERSION < 0.88) ? 1 : 0);' 2>/dev/null || echo 0) Name: perl-Package-Stash -Version: 0.36 -Release: 3%{?dist} +Version: 0.37 +Release: 1%{?dist} Summary: Routines for manipulating stashes Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/Package-Stash/ Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-%{version}.tar.gz -Patch1: Package-Stash-0.36-old-Test::More.patch +Patch1: Package-Stash-0.37-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch -BuildRequires: perl(base) -BuildRequires: perl(Carp) +# Module Build +BuildRequires: perl BuildRequires: perl(Config) -BuildRequires: perl(constant) -BuildRequires: perl(Dist::CheckConflicts) >= 0.02 BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(File::Spec) -BuildRequires: perl(File::Temp) +BuildRequires: perl(Text::ParseWords) +# Module Runtime +BuildRequires: perl(B) +BuildRequires: perl(Carp) +BuildRequires: perl(constant) +BuildRequires: perl(Dist::CheckConflicts) >= 0.02 BuildRequires: perl(Getopt::Long) -BuildRequires: perl(lib) BuildRequires: perl(Module::Implementation) >= 0.06 BuildRequires: perl(Package::Stash::XS) >= 0.26 BuildRequires: perl(Scalar::Util) +BuildRequires: perl(strict) +BuildRequires: perl(Symbol) +BuildRequires: perl(warnings) +# Test Suite +BuildRequires: perl(base) +BuildRequires: perl(IO::Handle) +BuildRequires: perl(IPC::Open3) +BuildRequires: perl(lib) BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::More) BuildRequires: perl(Test::Requires) -# Optional tests: -%if ! (0%{?rhel} >= 7) -%if %(perl -e 'print $] >= 5.014 ? 1 : 0;') +%if ! (0%{?rhel}) +# Optional Tests BuildRequires: perl(Package::Anon) -%endif +BuildRequires: perl(Variable::Magic) +# Extra Tests BuildRequires: perl(Pod::Coverage::TrustPod) BuildRequires: perl(Test::EOL) BuildRequires: perl(Test::LeakTrace) BuildRequires: perl(Test::NoTabs) -BuildRequires: perl(Test::Pod) -BuildRequires: perl(Test::Pod::Coverage) +BuildRequires: perl(Test::Pod) >= 1.41 +BuildRequires: perl(Test::Pod::Coverage) >= 1.08 %endif -BuildRequires: perl(Test::Script) -BuildRequires: perl(Text::ParseWords) -BuildRequires: perl(Variable::Magic) +# Runtime Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # For performance and consistency Requires: perl(Package::Stash::XS) >= 0.26 @@ -59,7 +67,7 @@ a simple API. # Compatibility with old Test::More versions %if %{old_test_more} -%patch1 -p1 +%patch1 %endif %build @@ -74,23 +82,38 @@ find %{buildroot} -type f -name .packlist -exec rm -f {} \; %check make test -%if ! (0%{?rhel} >= 7) -make test TEST_FILES="$(echo $(find xt/ -name '*.t'))" +# Extra Tests: Pod Coverage test fails due to lack of POD for Package::Stash::Conflicts +%if ! (0%{?rhel}) +make test TEST_FILES="$(echo $(find xt/ -name '*.t' | grep -v pod-coverage))" %endif %clean rm -rf %{buildroot} %files -%doc Changes LICENSE README +%if 0%{?_licensedir:1} +%license LICENSE +%else +%doc LICENSE +%endif +%doc Changes README %{_bindir}/package-stash-conflicts %{perl_vendorlib}/Package/ %{_mandir}/man1/package-stash-conflicts.1* %{_mandir}/man3/Package::Stash.3pm* -%{_mandir}/man3/Package::Stash::Conflicts.3pm* %{_mandir}/man3/Package::Stash::PP.3pm* %changelog +* Tue Sep 23 2014 Paul Howarth - 0.37-1 +- Update to 0.37 + - Fix spurious warning in taint mode (GH#12) +- Update patch for building with old Test::More versions +- No documentation for Package::Stash::Conflicts in this release +- Classify buildreqs by usage +- Use %%license where possible +- Don't try to run the extra tests for EL builds as we won't have the + dependencies + * Fri Aug 29 2014 Jitka Plesnikova - 0.36-3 - Perl 5.20 rebuild diff --git a/sources b/sources index d28865a..dbebd03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -066aa5099af88457c4f1eb2448272061 Package-Stash-0.36.tar.gz +7e47a8261312e1cf3d12bd2007916b66 Package-Stash-0.37.tar.gz