commit 03c81b65ae8037a0b554b5a7258e9548bd9d5874
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Wed Jan 12 11:17:40 2011 +0000
Update to 0.20
New upstream release 0.20
- Lower perl prereq to 5.8.1
- Make the leak tests release-only
Drop buildreq perl(Test::Requires), no longer needed
Update patches to apply cleanly, drop no-Test::Requires patch (no longer
needed), and add new patch to skip memory leak tests if we don't have
Test::LeakTrace (EPEL 4/5)
.gitignore | 2 +-
Package-Stash-XS-0.17-no-Test-Requires.patch | 26 -------
Package-Stash-XS-0.20-no-Test::LeakTrace.patch | 26 +++++++
...h => Package-Stash-XS-0.20-old-Test::More.patch | 72 ++++++++++----------
...m.patch => Package-Stash-XS-0.20-old-eumm.patch | 12 ++--
perl-Package-Stash-XS.spec | 24 +++++--
sources | 2 +-
7 files changed, 86 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0fe915d..2c6f041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Package-Stash-XS-0.19.tar.gz
+/Package-Stash-XS-0.20.tar.gz
diff --git a/Package-Stash-XS-0.20-no-Test::LeakTrace.patch b/Package-Stash-XS-0.20-no-Test::LeakTrace.patch
new file mode 100644
index 0000000..1573676
--- /dev/null
+++ b/Package-Stash-XS-0.20-no-Test::LeakTrace.patch
@@ -0,0 +1,26 @@
+diff -up Package-Stash-XS-0.20/t/release-20-leaks.t.orig Package-Stash-XS-0.20/t/release-20-leaks.t
+--- Package-Stash-XS-0.20/t/release-20-leaks.t.orig 2011-01-12 09:17:41.622919245 +0000
++++ Package-Stash-XS-0.20/t/release-20-leaks.t 2011-01-12 09:19:44.023423136 +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 $@;
+
+ use Package::Stash;
+ use Symbol;
+diff -up Package-Stash-XS-0.20/t/release-21-leaks-debug.t.orig Package-Stash-XS-0.20/t/release-21-leaks-debug.t
+--- Package-Stash-XS-0.20/t/release-21-leaks-debug.t.orig 2011-01-12 09:17:41.623919274 +0000
++++ Package-Stash-XS-0.20/t/release-21-leaks-debug.t 2011-01-12 09:20:02.733958255 +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 $@;
+
+ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
+
diff --git a/Package-Stash-XS-0.19-old-Test::More.patch b/Package-Stash-XS-0.20-old-Test::More.patch
similarity index 57%
rename from Package-Stash-XS-0.19-old-Test::More.patch
rename to Package-Stash-XS-0.20-old-Test::More.patch
index 95903c1..b9c18de 100644
--- a/Package-Stash-XS-0.19-old-Test::More.patch
+++ b/Package-Stash-XS-0.20-old-Test::More.patch
@@ -1,6 +1,6 @@
-diff -up Package-Stash-XS-0.19/t/01-basic.t.orig Package-Stash-XS-0.19/t/01-basic.t
---- Package-Stash-XS-0.19/t/01-basic.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/01-basic.t 2011-01-06 08:55:03.658919749 +0000
+diff -up Package-Stash-XS-0.20/t/01-basic.t.orig Package-Stash-XS-0.20/t/01-basic.t
+--- Package-Stash-XS-0.20/t/01-basic.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/01-basic.t 2011-01-12 09:16:54.151558280 +0000
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -16,9 +16,9 @@ diff -up Package-Stash-XS-0.19/t/01-basic.t.orig Package-Stash-XS-0.19/t/01-basi
}
-
-done_testing;
-diff -up Package-Stash-XS-0.19/t/02-extension.t.orig Package-Stash-XS-0.19/t/02-extension.t
---- Package-Stash-XS-0.19/t/02-extension.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/02-extension.t 2011-01-06 08:55:03.682920449 +0000
+diff -up Package-Stash-XS-0.20/t/02-extension.t.orig Package-Stash-XS-0.20/t/02-extension.t
+--- Package-Stash-XS-0.20/t/02-extension.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/02-extension.t 2011-01-12 09:16:54.172558884 +0000
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -34,9 +34,9 @@ diff -up Package-Stash-XS-0.19/t/02-extension.t.orig Package-Stash-XS-0.19/t/02-
ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
-
-done_testing;
-diff -up Package-Stash-XS-0.19/t/03-io.t.orig Package-Stash-XS-0.19/t/03-io.t
---- Package-Stash-XS-0.19/t/03-io.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/03-io.t 2011-01-06 08:55:03.683920478 +0000
+diff -up Package-Stash-XS-0.20/t/03-io.t.orig Package-Stash-XS-0.20/t/03-io.t
+--- Package-Stash-XS-0.20/t/03-io.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/03-io.t 2011-01-12 09:16:54.173558912 +0000
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -52,9 +52,9 @@ diff -up Package-Stash-XS-0.19/t/03-io.t.orig Package-Stash-XS-0.19/t/03-io.t
}
-
-done_testing;
-diff -up Package-Stash-XS-0.19/t/04-get.t.orig Package-Stash-XS-0.19/t/04-get.t
---- Package-Stash-XS-0.19/t/04-get.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/04-get.t 2011-01-06 08:55:03.683920478 +0000
+diff -up Package-Stash-XS-0.20/t/04-get.t.orig Package-Stash-XS-0.20/t/04-get.t
+--- Package-Stash-XS-0.20/t/04-get.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/04-get.t 2011-01-12 09:16:54.174558941 +0000
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -70,9 +70,9 @@ diff -up Package-Stash-XS-0.19/t/04-get.t.orig Package-Stash-XS-0.19/t/04-get.t
}
-
-done_testing;
-diff -up Package-Stash-XS-0.19/t/05-isa.t.orig Package-Stash-XS-0.19/t/05-isa.t
---- Package-Stash-XS-0.19/t/05-isa.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/05-isa.t 2011-01-06 08:55:03.684920507 +0000
+diff -up Package-Stash-XS-0.20/t/05-isa.t.orig Package-Stash-XS-0.20/t/05-isa.t
+--- Package-Stash-XS-0.20/t/05-isa.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/05-isa.t 2011-01-12 09:16:54.174558941 +0000
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -92,9 +92,9 @@ diff -up Package-Stash-XS-0.19/t/05-isa.t.orig Package-Stash-XS-0.19/t/05-isa.t
-
-done_testing;
+}
-diff -up Package-Stash-XS-0.19/t/06-addsub.t.orig Package-Stash-XS-0.19/t/06-addsub.t
---- Package-Stash-XS-0.19/t/06-addsub.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/06-addsub.t 2011-01-06 08:55:03.684920507 +0000
+diff -up Package-Stash-XS-0.20/t/06-addsub.t.orig Package-Stash-XS-0.20/t/06-addsub.t
+--- Package-Stash-XS-0.20/t/06-addsub.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/06-addsub.t 2011-01-12 09:16:54.175558970 +0000
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -110,9 +110,9 @@ diff -up Package-Stash-XS-0.19/t/06-addsub.t.orig Package-Stash-XS-0.19/t/06-add
'... got the right %DB::sub value for dunk with specified args';
-
-done_testing;
-diff -up Package-Stash-XS-0.19/t/07-edge-cases.t.orig Package-Stash-XS-0.19/t/07-edge-cases.t
---- Package-Stash-XS-0.19/t/07-edge-cases.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/07-edge-cases.t 2011-01-06 08:56:02.763644477 +0000
+diff -up Package-Stash-XS-0.20/t/07-edge-cases.t.orig Package-Stash-XS-0.20/t/07-edge-cases.t
+--- Package-Stash-XS-0.20/t/07-edge-cases.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/07-edge-cases.t 2011-01-12 09:16:54.175558970 +0000
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -128,9 +128,9 @@ diff -up Package-Stash-XS-0.19/t/07-edge-cases.t.orig Package-Stash-XS-0.19/t/07
use_ok('CompileTime');
-
-done_testing;
-diff -up Package-Stash-XS-0.19/t/10-synopsis.t.orig Package-Stash-XS-0.19/t/10-synopsis.t
---- Package-Stash-XS-0.19/t/10-synopsis.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/10-synopsis.t 2011-01-06 08:55:03.684920508 +0000
+diff -up Package-Stash-XS-0.20/t/10-synopsis.t.orig Package-Stash-XS-0.20/t/10-synopsis.t
+--- Package-Stash-XS-0.20/t/10-synopsis.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/10-synopsis.t 2011-01-12 09:16:54.176558998 +0000
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -146,10 +146,10 @@ diff -up Package-Stash-XS-0.19/t/10-synopsis.t.orig Package-Stash-XS-0.19/t/10-s
is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
-
-done_testing;
-diff -up Package-Stash-XS-0.19/t/20-leaks.t.orig Package-Stash-XS-0.19/t/20-leaks.t
---- Package-Stash-XS-0.19/t/20-leaks.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/20-leaks.t 2011-01-06 08:55:03.686920566 +0000
-@@ -9,6 +9,8 @@ use Test::Requires 'Test::LeakTrace';
+diff -up Package-Stash-XS-0.20/t/release-20-leaks.t.orig Package-Stash-XS-0.20/t/release-20-leaks.t
+--- Package-Stash-XS-0.20/t/release-20-leaks.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/release-20-leaks.t 2011-01-12 09:16:54.177559027 +0000
+@@ -17,6 +17,8 @@ use Test::LeakTrace;
use Package::Stash;
use Symbol;
@@ -158,7 +158,7 @@ diff -up Package-Stash-XS-0.19/t/20-leaks.t.orig Package-Stash-XS-0.19/t/20-leak
{
package Bar;
}
-@@ -136,7 +138,10 @@ use Symbol;
+@@ -144,7 +146,10 @@ use Symbol;
ok($foo->has_symbol('@ISA'));
is(ref($foo->get_symbol('@ISA')), 'ARRAY');
is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
@@ -169,16 +169,16 @@ diff -up Package-Stash-XS-0.19/t/20-leaks.t.orig Package-Stash-XS-0.19/t/20-leak
}
{
-@@ -190,5 +195,3 @@ use Symbol;
+@@ -198,5 +203,3 @@ use Symbol;
eval { $foo->get_or_add_symbol('&blorg') };
} "doesn't leak on errors";
}
-
-done_testing;
-diff -up Package-Stash-XS-0.19/t/21-leaks-debug.t.orig Package-Stash-XS-0.19/t/21-leaks-debug.t
---- Package-Stash-XS-0.19/t/21-leaks-debug.t.orig 2011-01-06 05:07:37.000000000 +0000
-+++ Package-Stash-XS-0.19/t/21-leaks-debug.t 2011-01-06 08:55:03.687920595 +0000
-@@ -11,6 +11,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
+diff -up Package-Stash-XS-0.20/t/release-21-leaks-debug.t.orig Package-Stash-XS-0.20/t/release-21-leaks-debug.t
+--- Package-Stash-XS-0.20/t/release-21-leaks-debug.t.orig 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/t/release-21-leaks-debug.t 2011-01-12 09:16:54.177559027 +0000
+@@ -19,6 +19,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
use Package::Stash;
use Symbol;
@@ -187,7 +187,7 @@ diff -up Package-Stash-XS-0.19/t/21-leaks-debug.t.orig Package-Stash-XS-0.19/t/2
{
package Bar;
}
-@@ -138,7 +140,10 @@ use Symbol;
+@@ -146,7 +148,10 @@ use Symbol;
ok($foo->has_symbol('@ISA'));
is(ref($foo->get_symbol('@ISA')), 'ARRAY');
is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
@@ -198,7 +198,7 @@ diff -up Package-Stash-XS-0.19/t/21-leaks-debug.t.orig Package-Stash-XS-0.19/t/2
}
{
-@@ -192,5 +197,3 @@ use Symbol;
+@@ -200,5 +205,3 @@ use Symbol;
eval { $foo->get_or_add_symbol('&blorg') };
} "doesn't leak on errors";
}
diff --git a/Package-Stash-XS-0.17-old-eumm.patch b/Package-Stash-XS-0.20-old-eumm.patch
similarity index 68%
rename from Package-Stash-XS-0.17-old-eumm.patch
rename to Package-Stash-XS-0.20-old-eumm.patch
index fb4c09a..75a107a 100644
--- a/Package-Stash-XS-0.17-old-eumm.patch
+++ b/Package-Stash-XS-0.20-old-eumm.patch
@@ -1,16 +1,16 @@
---- Package-Stash-XS-0.17/Makefile.PL 2010-11-16 21:41:01.000000000 +0000
-+++ Package-Stash-XS-0.17/Makefile.PL 2010-11-17 11:08:49.844078063 +0000
+--- Package-Stash-XS-0.20/Makefile.PL 2011-01-11 17:35:44.000000000 +0000
++++ Package-Stash-XS-0.20/Makefile.PL 2011-01-12 09:05:56.710721007 +0000
@@ -4,7 +4,7 @@
- BEGIN { require 5.8.3; }
+ BEGIN { require 5.8.1; }
-use ExtUtils::MakeMaker 6.31;
+use ExtUtils::MakeMaker 6.17;
-@@ -17,7 +17,7 @@
- 'Test::Requires' => '0'
+@@ -16,7 +16,7 @@
+ 'Test::More' => '0.88'
},
'CONFIGURE_REQUIRES' => {
- 'ExtUtils::MakeMaker' => '6.31'
@@ -18,7 +18,7 @@
},
'DISTNAME' => 'Package-Stash-XS',
'EXE_FILES' => [],
-@@ -47,6 +47,9 @@
+@@ -46,6 +46,9 @@
delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
diff --git a/perl-Package-Stash-XS.spec b/perl-Package-Stash-XS.spec
index edd5c36..8fc55e5 100644
--- a/perl-Package-Stash-XS.spec
+++ b/perl-Package-Stash-XS.spec
@@ -1,16 +1,16 @@
Name: perl-Package-Stash-XS
-Version: 0.19
+Version: 0.20
Release: 1%{?dist}
Summary: Faster and more correct implementation of the Package::Stash API
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Package-Stash-XS/
Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-%{version}.tar.gz
-Patch0: Package-Stash-XS-0.17-old-eumm.patch
-Patch1: Package-Stash-XS-0.19-old-Test::More.patch
-Patch2: Package-Stash-XS-0.17-no-Test-Requires.patch
+Patch0: Package-Stash-XS-0.20-old-eumm.patch
+Patch1: Package-Stash-XS-0.20-old-Test::More.patch
+Patch2: Package-Stash-XS-0.20-no-Test::LeakTrace.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: perl >= 3:5.8.3
+BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Test::EOL)
BuildRequires: perl(Test::Fatal)
@@ -24,7 +24,6 @@ BuildRequires: perl(Test::LeakTrace) >= 0.11
%endif
%if "%{?rhel}" != "4"
BuildRequires: perl(Pod::Coverage::TrustPod)
-BuildRequires: perl(Test::Requires)
%endif
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -49,8 +48,8 @@ installed, and should be preferred in all environments with a compiler.
%patch1 -p1
%endif
-# Work around absence of Test::Requires in EPEL-4
-%if "%{?rhel}" == "4"
+# Work around absence of Test::LeakTrace in EPEL-4 and EPEL-5
+%if "%{?rhel}" == "4" || "%{?rhel}" == "5"
%patch2 -p1
%endif
@@ -80,6 +79,15 @@ rm -rf %{buildroot}
%{_mandir}/man3/Package::Stash::XS.3pm*
%changelog
+* Wed Jan 12 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 0.20-1
+- Update to 0.20
+ - Lower perl prereq to 5.8.1
+ - Make the leak tests release-only
+- Update patches to apply cleanly
+- Drop no-Test::Requires patch, no longer needed
+- Drop buildreq perl(Test::Requires), no longer needed
+- Add patch to skip memory leak tests if we don't have Test::LeakTrace
+
* Thu Jan 6 2011 Paul Howarth <paul@xxxxxxxxxxxx> - 0.19-1
- Update to 0.19 (more correct validity test for scalars)
- Update patch for old Test::More versions
diff --git a/sources b/sources
index 3515897..2d06477 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c3a5d7f4589b0d3566d7ee9122a12c9 Package-Stash-XS-0.19.tar.gz
+81ff568107ba4777186e0872b4be69b7 Package-Stash-XS-0.20.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
