From 2750ead62ac40fe9c116e11845328cdd56247402 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Wed, 4 Sep 2013 14:00:34 +0100 Subject: [PATCH] Update to 0.36 - New upstream release 0.36 - Support building with PUREPERL_ONLY - BR: perl(Config), perl(Text::ParseWords) and perl(Variable::Magic) - Update patch for building with old Test::More version in EPEL-5 --- ...=> Package-Stash-0.36-old-Test::More.patch | 127 ++++++++++-------- perl-Package-Stash.spec | 15 ++- sources | 2 +- 3 files changed, 85 insertions(+), 59 deletions(-) rename Package-Stash-0.34-old-Test::More.patch => Package-Stash-0.36-old-Test::More.patch (75%) diff --git a/Package-Stash-0.34-old-Test::More.patch b/Package-Stash-0.36-old-Test::More.patch similarity index 75% rename from Package-Stash-0.34-old-Test::More.patch rename to Package-Stash-0.36-old-Test::More.patch index e39f26d..d4ace0e 100644 --- a/Package-Stash-0.34-old-Test::More.patch +++ b/Package-Stash-0.36-old-Test::More.patch @@ -1,6 +1,6 @@ diff -up ./t/addsub.t.orig ./t/addsub.t ---- ./t/addsub.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/addsub.t 2013-01-06 21:34:11.930954402 +0000 +--- ./t/addsub.t.orig 2013-09-04 01:29:07.000000000 +0100 ++++ ./t/addsub.t 2013-09-04 10:03:50.247120380 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -17,8 +17,8 @@ diff -up ./t/addsub.t.orig ./t/addsub.t - -done_testing; diff -up ./t/anon-basic.t.orig ./t/anon-basic.t ---- ./t/anon-basic.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/anon-basic.t 2013-01-06 21:34:11.947954406 +0000 +--- ./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'; @@ -35,8 +35,8 @@ diff -up ./t/anon-basic.t.orig ./t/anon-basic.t - -done_testing; diff -up ./t/anon.t.orig ./t/anon.t ---- ./t/anon.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/anon.t 2013-01-06 21:34:11.948954407 +0000 +--- ./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'; @@ -53,8 +53,8 @@ diff -up ./t/anon.t.orig ./t/anon.t - -done_testing; diff -up ./t/bare-anon-basic.t.orig ./t/bare-anon-basic.t ---- ./t/bare-anon-basic.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/bare-anon-basic.t 2013-01-06 21:34:11.948954407 +0000 +--- ./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 plan skip_all => "This isn't really going to work yet, probably"; @@ -71,8 +71,8 @@ diff -up ./t/bare-anon-basic.t.orig ./t/bare-anon-basic.t - -done_testing; diff -up ./t/bare-anon.t.orig ./t/bare-anon.t ---- ./t/bare-anon.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/bare-anon.t 2013-01-06 21:34:11.948954407 +0000 +--- ./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 plan skip_all => "This isn't really going to work yet, probably"; @@ -89,8 +89,8 @@ diff -up ./t/bare-anon.t.orig ./t/bare-anon.t - -done_testing; diff -up ./t/basic.t.orig ./t/basic.t ---- ./t/basic.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/basic.t 2013-01-06 21:34:11.949954407 +0000 +--- ./t/basic.t.orig 2013-09-04 01:29:07.000000000 +0100 ++++ ./t/basic.t 2013-09-04 10:03:50.249120378 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -107,8 +107,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-01-04 09:39:44.000000000 +0000 -+++ ./t/compile-time.t 2013-01-06 21:34:11.949954407 +0000 +--- ./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 @@ -2,8 +2,6 @@ use strict; use warnings; @@ -120,8 +120,8 @@ diff -up ./t/compile-time.t.orig ./t/compile-time.t - -done_testing; diff -up ./t/edge-cases.t.orig ./t/edge-cases.t ---- ./t/edge-cases.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/edge-cases.t 2013-01-06 21:34:11.949954407 +0000 +--- ./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 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -138,8 +138,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-01-04 09:39:44.000000000 +0000 -+++ ./t/extension.t 2013-01-06 21:34:11.950954407 +0000 +--- ./t/extension.t.orig 2013-09-04 01:29:07.000000000 +0100 ++++ ./t/extension.t 2013-09-04 10:03:50.250120376 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -156,8 +156,8 @@ diff -up ./t/extension.t.orig ./t/extension.t - -done_testing; diff -up ./t/get.t.orig ./t/get.t ---- ./t/get.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/get.t 2013-01-06 21:34:11.950954407 +0000 +--- ./t/get.t.orig 2013-09-04 01:29:07.000000000 +0100 ++++ ./t/get.t 2013-09-04 10:03:50.250120376 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -174,8 +174,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-01-04 09:39:44.000000000 +0000 -+++ ./t/impl-selection/basic-pp.t 2013-01-06 21:34:11.950954407 +0000 +--- ./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 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -192,8 +192,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-01-04 09:39:44.000000000 +0000 -+++ ./t/impl-selection/basic-xs.t 2013-01-06 21:34:11.951954407 +0000 +--- ./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 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -210,8 +210,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-01-04 09:39:44.000000000 +0000 -+++ ./t/impl-selection/bug-rt-78272.t 2013-01-06 21:36:22.471987526 +0000 +--- ./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 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -241,8 +241,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-01-04 09:39:44.000000000 +0000 -+++ ./t/impl-selection/choice.t 2013-01-06 21:34:11.951954407 +0000 +--- ./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 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -259,8 +259,8 @@ diff -up ./t/impl-selection/choice.t.orig ./t/impl-selection/choice.t - -done_testing; diff -up ./t/impl-selection/env.t.orig ./t/impl-selection/env.t ---- ./t/impl-selection/env.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/impl-selection/env.t 2013-01-06 21:34:11.952954407 +0000 +--- ./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 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -277,8 +277,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-01-04 09:39:44.000000000 +0000 -+++ ./t/impl-selection/var.t 2013-01-06 21:34:11.952954407 +0000 +--- ./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 @@ -1,7 +1,7 @@ #!/usr/bin/env perl use strict; @@ -295,8 +295,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-01-04 09:39:44.000000000 +0000 -+++ ./t/io.t 2013-01-06 21:34:11.952954407 +0000 +--- ./t/io.t.orig 2013-09-04 01:29:07.000000000 +0100 ++++ ./t/io.t 2013-09-04 10:03:50.252120374 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -313,8 +313,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-01-04 09:39:44.000000000 +0000 -+++ ./t/isa.t 2013-01-06 21:34:11.953954407 +0000 +--- ./t/isa.t.orig 2013-09-04 01:29:07.000000000 +0100 ++++ ./t/isa.t 2013-09-04 10:03:50.253120373 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -360,26 +360,25 @@ 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-01-04 09:39:44.000000000 +0000 -+++ ./t/magic.t 2013-01-06 21:34:11.953954407 +0000 +--- ./t/magic.t.orig 2013-09-04 01:29:07.000000000 +0100 ++++ ./t/magic.t 2013-09-04 10:04:56.321041441 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; use lib 't/lib'; -use Test::More; -+use Test::More tests => 4; ++use Test::More tests => 14; use Package::Stash; -@@ -28,5 +28,3 @@ use Package::Stash; - my @foo = qw(a b c); - is(eval q["@foo"], 'a-b-c'); +@@ -77,4 +77,3 @@ SKIP: { + is($store, 0, "get_or_add_symbol stores (populated slot)"); } -- + -done_testing; diff -up ./t/paamayim_nekdotayim.t.orig ./t/paamayim_nekdotayim.t ---- ./t/paamayim_nekdotayim.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/paamayim_nekdotayim.t 2013-01-06 21:34:11.953954407 +0000 +--- ./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 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -396,8 +395,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-01-04 09:39:44.000000000 +0000 -+++ ./t/scalar-values.t 2013-01-06 21:34:11.953954407 +0000 +--- ./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 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -414,8 +413,8 @@ diff -up ./t/scalar-values.t.orig ./t/scalar-values.t - -done_testing; diff -up ./t/stash-deletion.t.orig ./t/stash-deletion.t ---- ./t/stash-deletion.t.orig 2013-01-04 09:39:44.000000000 +0000 -+++ ./t/stash-deletion.t 2013-01-06 21:34:11.954954407 +0000 +--- ./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 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -432,8 +431,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-01-04 09:39:44.000000000 +0000 -+++ ./t/synopsis.t 2013-01-06 21:34:11.954954407 +0000 +--- ./t/synopsis.t.orig 2013-09-04 01:29:07.000000000 +0100 ++++ ./t/synopsis.t 2013-09-04 10:03:50.254120371 +0100 @@ -2,7 +2,7 @@ use strict; use warnings; @@ -449,9 +448,27 @@ 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 + use strict; + use warnings; +-use Test::More; ++use Test::More tests => 1; + + use Package::Stash; + +@@ -17,5 +17,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-01-04 09:39:44.000000000 +0000 -+++ ./xt/author/leaks-debug.t 2013-01-06 21:34:11.954954407 +0000 +--- ./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 @@ -6,6 +6,8 @@ use Test::More; use Test::Fatal; use Test::LeakTrace; @@ -479,8 +496,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-01-04 09:39:44.000000000 +0000 -+++ ./xt/author/leaks.t 2013-01-06 21:34:11.955954408 +0000 +--- ./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 @@ -6,6 +6,8 @@ use Test::More; use Test::Fatal; use Test::LeakTrace; diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec index 5b0a0ae..2a8cbf2 100644 --- a/perl-Package-Stash.spec +++ b/perl-Package-Stash.spec @@ -2,18 +2,19 @@ %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.35 -Release: 3%{?dist} +Version: 0.36 +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.34-old-Test::More.patch +Patch1: Package-Stash-0.36-old-Test::More.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu) BuildArch: noarch BuildRequires: perl(base) BuildRequires: perl(Carp) +BuildRequires: perl(Config) BuildRequires: perl(constant) BuildRequires: perl(Dist::CheckConflicts) >= 0.02 BuildRequires: perl(ExtUtils::MakeMaker) @@ -40,6 +41,8 @@ BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) %endif BuildRequires: perl(Test::Script) +BuildRequires: perl(Text::ParseWords) +BuildRequires: perl(Variable::Magic) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) # For performance and consistency Requires: perl(Package::Stash::XS) >= 0.26 @@ -88,6 +91,12 @@ rm -rf %{buildroot} %{_mandir}/man3/Package::Stash::PP.3pm* %changelog +* Wed Sep 4 2013 Paul Howarth - 0.36-1 +- Update to 0.36 + - Support building with PUREPERL_ONLY +- BR: perl(Config), perl(Text::ParseWords) and perl(Variable::Magic) +- Update patch for building with old Test::More version in EPEL-5 + * Sun Aug 04 2013 Fedora Release Engineering - 0.35-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index a9410d1..d28865a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -423e99f76382cb71119f5f3a69c1e29e Package-Stash-0.35.tar.gz +066aa5099af88457c4f1eb2448272061 Package-Stash-0.36.tar.gz