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
This commit is contained in:
Paul Howarth 2011-01-25 19:10:58 +00:00
parent c0ef9ce904
commit c9d7f7c164
6 changed files with 47 additions and 41 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/Package-Stash-0.24.tar.gz /Package-Stash-0.25.tar.gz

View File

@ -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;

View File

@ -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;

View File

@ -236,9 +236,9 @@ diff -up Package-Stash-0.23/t/impl-selection/11-basic-xs.t.orig Package-Stash-0.
} }
- -
-done_testing; -done_testing;
diff -up Package-Stash-0.23/t/release-20-leaks.t.orig Package-Stash-0.23/t/release-20-leaks.t 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/release-20-leaks.t.orig 2011-01-11 17:44:23.000000000 +0000 --- Package-Stash-0.23/t/author-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 +++ Package-Stash-0.23/t/author-20-leaks.t 2011-01-12 09:44:54.067671046 +0000
@@ -14,6 +14,8 @@ use Test::More; @@ -14,6 +14,8 @@ use Test::More;
use Test::Fatal; use Test::Fatal;
use Test::LeakTrace; 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; -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 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/release-21-leaks-debug.t.orig 2011-01-11 17:44:23.000000000 +0000 --- Package-Stash-0.23/t/author-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 +++ 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; @@ -14,6 +14,8 @@ use Test::More;
use Test::Fatal; use Test::Fatal;
use Test::LeakTrace; use Test::LeakTrace;

View File

@ -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) %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 Name: perl-Package-Stash
Version: 0.24 Version: 0.25
Release: 1%{?dist} Release: 1%{?dist}
Summary: Routines for manipulating stashes Summary: Routines for manipulating stashes
Group: Development/Libraries Group: Development/Libraries
@ -13,19 +13,18 @@ License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Package-Stash/ URL: http://search.cpan.org/dist/Package-Stash/
Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-%{version}.tar.gz 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 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 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
BuildRequires: perl(Dist::CheckConflicts) BuildRequires: perl(Dist::CheckConflicts)
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Scalar::Util) BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Package::DeprecationManager) 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::EOL)
BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::Fatal)
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::More) BuildRequires: perl(Test::More)
BuildRequires: perl(Test::NoTabs) BuildRequires: perl(Test::NoTabs)
BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod)
@ -42,7 +41,7 @@ BuildRequires: perl(Test::Script)
%endif %endif
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# For performance and consistency # For performance and consistency
Requires: perl(Package::Stash::XS) >= 0.19 Requires: perl(Package::Stash::XS) >= 0.21
# Not found by rpm auto-provides # Not found by rpm auto-provides
Provides: perl(Package::Stash::Conflicts) = 0 Provides: perl(Package::Stash::Conflicts) = 0
@ -88,7 +87,7 @@ find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
%{_fixperms} %{buildroot} %{_fixperms} %{buildroot}
%check %check
make test RELEASE_TESTING=1 make test AUTHOR_TESTING=1 RELEASE_TESTING=1
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -102,6 +101,13 @@ rm -rf %{buildroot}
%{_mandir}/man3/Package::Stash::PP.3pm* %{_mandir}/man3/Package::Stash::PP.3pm*
%changelog %changelog
* Tue Jan 25 2011 Paul Howarth <paul@city-fan.org> - 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 <paul@city-fan.org> - 0.24-1 * Tue Jan 18 2011 Paul Howarth <paul@city-fan.org> - 0.24-1
- Update to 0.24 (reinstate Test::Requires dependency) - Update to 0.24 (reinstate Test::Requires dependency)

View File

@ -1 +1 @@
eaca5beadc60bad6541ef7c5f02d30b7 Package-Stash-0.24.tar.gz d0246414c6add513fdcc8c3c8e7dd83f Package-Stash-0.25.tar.gz