From c9d7f7c1648ba1159579d067179cd48796b59d84 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 25 Jan 2011 19:10:58 +0000 Subject: [PATCH] Update to 0.25 - New upstream release 0.25 - Make the leak tests author-only, since some smokers run release tests - Update patches to apply cleanly - Bump perl(Package::Stash::XS) version requirement to 0.21 - Drop buildreq perl(Test::Exception), no longer needed --- .gitignore | 2 +- Package-Stash-0.23-no-Test::LeakTrace.patch | 26 ------------------- Package-Stash-0.25-no-Test::LeakTrace.patch | 26 +++++++++++++++++++ ...=> Package-Stash-0.25-old-Test::More.patch | 12 ++++----- perl-Package-Stash.spec | 20 +++++++++----- sources | 2 +- 6 files changed, 47 insertions(+), 41 deletions(-) delete mode 100644 Package-Stash-0.23-no-Test::LeakTrace.patch create mode 100644 Package-Stash-0.25-no-Test::LeakTrace.patch rename Package-Stash-0.23-old-Test::More.patch => Package-Stash-0.25-old-Test::More.patch (94%) diff --git a/.gitignore b/.gitignore index d79191a..9ccf63d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/Package-Stash-0.24.tar.gz +/Package-Stash-0.25.tar.gz diff --git a/Package-Stash-0.23-no-Test::LeakTrace.patch b/Package-Stash-0.23-no-Test::LeakTrace.patch deleted file mode 100644 index a66dacd..0000000 --- a/Package-Stash-0.23-no-Test::LeakTrace.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up Package-Stash-0.23/t/release-20-leaks.t.orig Package-Stash-0.23/t/release-20-leaks.t ---- Package-Stash-0.23/t/release-20-leaks.t.orig 2011-01-12 09:57:19.000000000 +0000 -+++ Package-Stash-0.23/t/release-20-leaks.t 2011-01-12 09:58:40.139310210 +0000 -@@ -12,7 +12,8 @@ use warnings; - use lib 't/lib'; - use Test::More; - use Test::Fatal; --use Test::LeakTrace; -+eval "use Test::LeakTrace"; -+plan skip_all => "Test::LeakTrace required for this test" if $@; - - plan tests => 25; - -diff -up Package-Stash-0.23/t/release-21-leaks-debug.t.orig Package-Stash-0.23/t/release-21-leaks-debug.t ---- Package-Stash-0.23/t/release-21-leaks-debug.t.orig 2011-01-12 09:57:19.000000000 +0000 -+++ Package-Stash-0.23/t/release-21-leaks-debug.t 2011-01-12 09:58:51.082622361 +0000 -@@ -12,7 +12,8 @@ use warnings; - use lib 't/lib'; - use Test::More; - use Test::Fatal; --use Test::LeakTrace; -+eval "use Test::LeakTrace"; -+plan skip_all => "Test::LeakTrace required for this test" if $@; - - plan tests => 25; - diff --git a/Package-Stash-0.25-no-Test::LeakTrace.patch b/Package-Stash-0.25-no-Test::LeakTrace.patch new file mode 100644 index 0000000..caa832f --- /dev/null +++ b/Package-Stash-0.25-no-Test::LeakTrace.patch @@ -0,0 +1,26 @@ +diff -up Package-Stash-0.23/t/author-20-leaks.t.orig Package-Stash-0.23/t/author-20-leaks.t +--- Package-Stash-0.23/t/author-20-leaks.t.orig 2011-01-12 09:57:19.000000000 +0000 ++++ Package-Stash-0.23/t/author-20-leaks.t 2011-01-12 09:58:40.139310210 +0000 +@@ -12,7 +12,8 @@ use warnings; + use lib 't/lib'; + use Test::More; + use Test::Fatal; +-use Test::LeakTrace; ++eval "use Test::LeakTrace"; ++plan skip_all => "Test::LeakTrace required for this test" if $@; + + plan tests => 25; + +diff -up Package-Stash-0.23/t/author-21-leaks-debug.t.orig Package-Stash-0.23/t/author-21-leaks-debug.t +--- Package-Stash-0.23/t/author-21-leaks-debug.t.orig 2011-01-12 09:57:19.000000000 +0000 ++++ Package-Stash-0.23/t/author-21-leaks-debug.t 2011-01-12 09:58:51.082622361 +0000 +@@ -12,7 +12,8 @@ use warnings; + use lib 't/lib'; + use Test::More; + use Test::Fatal; +-use Test::LeakTrace; ++eval "use Test::LeakTrace"; ++plan skip_all => "Test::LeakTrace required for this test" if $@; + + plan tests => 25; + diff --git a/Package-Stash-0.23-old-Test::More.patch b/Package-Stash-0.25-old-Test::More.patch similarity index 94% rename from Package-Stash-0.23-old-Test::More.patch rename to Package-Stash-0.25-old-Test::More.patch index d303123..543089b 100644 --- a/Package-Stash-0.23-old-Test::More.patch +++ b/Package-Stash-0.25-old-Test::More.patch @@ -236,9 +236,9 @@ diff -up Package-Stash-0.23/t/impl-selection/11-basic-xs.t.orig Package-Stash-0. } - -done_testing; -diff -up Package-Stash-0.23/t/release-20-leaks.t.orig Package-Stash-0.23/t/release-20-leaks.t ---- Package-Stash-0.23/t/release-20-leaks.t.orig 2011-01-11 17:44:23.000000000 +0000 -+++ Package-Stash-0.23/t/release-20-leaks.t 2011-01-12 09:44:54.067671046 +0000 +diff -up Package-Stash-0.23/t/author-20-leaks.t.orig Package-Stash-0.23/t/author-20-leaks.t +--- Package-Stash-0.23/t/author-20-leaks.t.orig 2011-01-11 17:44:23.000000000 +0000 ++++ Package-Stash-0.23/t/author-20-leaks.t 2011-01-12 09:44:54.067671046 +0000 @@ -14,6 +14,8 @@ use Test::More; use Test::Fatal; use Test::LeakTrace; @@ -265,9 +265,9 @@ diff -up Package-Stash-0.23/t/release-20-leaks.t.orig Package-Stash-0.23/t/relea } - -done_testing; -diff -up Package-Stash-0.23/t/release-21-leaks-debug.t.orig Package-Stash-0.23/t/release-21-leaks-debug.t ---- Package-Stash-0.23/t/release-21-leaks-debug.t.orig 2011-01-11 17:44:23.000000000 +0000 -+++ Package-Stash-0.23/t/release-21-leaks-debug.t 2011-01-12 09:44:37.395192951 +0000 +diff -up Package-Stash-0.23/t/author-21-leaks-debug.t.orig Package-Stash-0.23/t/author-21-leaks-debug.t +--- Package-Stash-0.23/t/author-21-leaks-debug.t.orig 2011-01-11 17:44:23.000000000 +0000 ++++ Package-Stash-0.23/t/author-21-leaks-debug.t 2011-01-12 09:44:37.395192951 +0000 @@ -14,6 +14,8 @@ use Test::More; use Test::Fatal; use Test::LeakTrace; diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec index d6ebf03..4a66142 100644 --- a/perl-Package-Stash.spec +++ b/perl-Package-Stash.spec @@ -5,7 +5,7 @@ %global old_eumm %(perl -MExtUtils::MakeMaker -e 'printf "%d\\n", $ExtUtils::MakeMaker::VERSION < 6.31 ? 1 : 0;' 2>/dev/null || echo 0) Name: perl-Package-Stash -Version: 0.24 +Version: 0.25 Release: 1%{?dist} Summary: Routines for manipulating stashes Group: Development/Libraries @@ -13,19 +13,18 @@ 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 Patch0: Package-Stash-0.23-EU::MM-version.patch -Patch1: Package-Stash-0.23-old-Test::More.patch +Patch1: Package-Stash-0.25-old-Test::More.patch Patch2: Package-Stash-0.23-no-Test::Requires.patch -Patch3: Package-Stash-0.23-no-Test::LeakTrace.patch +Patch3: Package-Stash-0.25-no-Test::LeakTrace.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Dist::CheckConflicts) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Scalar::Util) BuildRequires: perl(Package::DeprecationManager) -BuildRequires: perl(Package::Stash::XS) >= 0.19 +BuildRequires: perl(Package::Stash::XS) >= 0.21 BuildRequires: perl(Test::EOL) BuildRequires: perl(Test::Fatal) -BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::More) BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::Pod) @@ -42,7 +41,7 @@ BuildRequires: perl(Test::Script) %endif Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # For performance and consistency -Requires: perl(Package::Stash::XS) >= 0.19 +Requires: perl(Package::Stash::XS) >= 0.21 # Not found by rpm auto-provides Provides: perl(Package::Stash::Conflicts) = 0 @@ -88,7 +87,7 @@ find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null %{_fixperms} %{buildroot} %check -make test RELEASE_TESTING=1 +make test AUTHOR_TESTING=1 RELEASE_TESTING=1 %clean rm -rf %{buildroot} @@ -102,6 +101,13 @@ rm -rf %{buildroot} %{_mandir}/man3/Package::Stash::PP.3pm* %changelog +* Tue Jan 25 2011 Paul Howarth - 0.25-1 +- Update to 0.25 (make the leak tests author-only, since some smokers run + release tests) +- Update patches to apply cleanly +- Bump perl(Package::Stash::XS) version requirement to 0.21 +- Drop buildreq perl(Test::Exception), no longer needed + * Tue Jan 18 2011 Paul Howarth - 0.24-1 - Update to 0.24 (reinstate Test::Requires dependency) diff --git a/sources b/sources index e4113d3..4b87742 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eaca5beadc60bad6541ef7c5f02d30b7 Package-Stash-0.24.tar.gz +d0246414c6add513fdcc8c3c8e7dd83f Package-Stash-0.25.tar.gz