From 5f816c8fcc8309f4fad32bec9e5d7454151b63c6 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Jan 12 2011 11:50:26 +0000
Subject: Update to 0.23


- New upstream release 0.23
  - Lower perl prereq to 5.8.1
  - Make the leak tests release-only
- Update patches to apply cleanly
- Add patch to skip memory leak tests if we don't have Test::LeakTrace
  (EPEL 4/5)

---

diff --git a/.gitignore b/.gitignore
index 3c7af49..827a5fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Package-Stash-0.22.tar.gz
+/Package-Stash-0.23.tar.gz
diff --git a/Package-Stash-0.20-no-Test::Requires.patch b/Package-Stash-0.20-no-Test::Requires.patch
deleted file mode 100644
index 4c02684..0000000
--- a/Package-Stash-0.20-no-Test::Requires.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up Package-Stash-0.20/t/20-leaks.t.orig Package-Stash-0.20/t/20-leaks.t
---- Package-Stash-0.20/t/20-leaks.t.orig	2011-01-04 16:31:03.000000000 +0000
-+++ Package-Stash-0.20/t/20-leaks.t	2011-01-04 16:32:31.507953903 +0000
-@@ -4,8 +4,12 @@ use warnings;
- use lib 't/lib';
- use Test::More;
- use Test::Fatal;
--use Test::Requires 'Test::LeakTrace';
--plan tests => 25;
-+eval "use Test::LeakTrace";
-+if ($@) {
-+    plan skip_all => "Test::LeakTrace required for this test";
-+} else {
-+    plan tests => 25;
-+}
- 
- use Package::Stash;
- use Symbol;
-diff -up Package-Stash-0.20/t/21-leaks-debug.t.orig Package-Stash-0.20/t/21-leaks-debug.t
---- Package-Stash-0.20/t/21-leaks-debug.t.orig	2011-01-04 16:31:03.000000000 +0000
-+++ Package-Stash-0.20/t/21-leaks-debug.t	2011-01-04 16:32:53.018560833 +0000
-@@ -4,8 +4,12 @@ use warnings;
- use lib 't/lib';
- use Test::More;
- use Test::Fatal;
--use Test::Requires 'Test::LeakTrace';
--plan tests => 25;
-+eval "use Test::LeakTrace";
-+if ($@) {
-+    plan skip_all => "Test::LeakTrace required for this test";
-+} else {
-+    plan tests => 25;
-+}
- 
- BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
- 
-diff -up Package-Stash-0.20/t/impl-selection/11-basic-xs.t.orig Package-Stash-0.20/t/impl-selection/11-basic-xs.t
---- Package-Stash-0.20/t/impl-selection/11-basic-xs.t.orig	2011-01-04 16:31:03.410468453 +0000
-+++ Package-Stash-0.20/t/impl-selection/11-basic-xs.t	2011-01-04 16:31:03.413468538 +0000
-@@ -3,7 +3,7 @@ use strict;
- use warnings;
- use Test::More tests => 124;
- use Test::Fatal;
--use Test::Requires 'Package::Stash::XS';
-+use Package::Stash::XS;
- 
- BEGIN { $Package::Stash::IMPLEMENTATION = 'XS' }
- 
diff --git a/Package-Stash-0.22-EU::MM-version.patch b/Package-Stash-0.22-EU::MM-version.patch
deleted file mode 100644
index 6e47ad6..0000000
--- a/Package-Stash-0.22-EU::MM-version.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- Package-Stash-0.22/Makefile.PL.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/Makefile.PL	2011-01-06 09:40:45.977580477 +0000
-@@ -3,7 +3,7 @@
- BEGIN { require 5.8.3; }
- use strict;
- use warnings;
--use ExtUtils::MakeMaker 6.31;
-+use ExtUtils::MakeMaker;
- check_conflicts();
- 
- my %WriteMakefileArgs = (
-@@ -16,7 +16,7 @@
-   },
-   'CONFIGURE_REQUIRES' => {
-     'Dist::CheckConflicts' => '0.01',
--    'ExtUtils::MakeMaker' => '6.31'
-+    'ExtUtils::MakeMaker' => '0'
-   },
-   'DISTNAME' => 'Package-Stash',
-   'EXE_FILES' => [
-@@ -49,6 +49,9 @@
-   }
- }
- 
-+delete $WriteMakefileArgs{LICENSE}
-+  unless eval { ExtUtils::MakeMaker->VERSION(6.31) };
-+
- delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
-   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
- 
diff --git a/Package-Stash-0.22-old-Test::More.patch b/Package-Stash-0.22-old-Test::More.patch
deleted file mode 100644
index b9474e5..0000000
--- a/Package-Stash-0.22-old-Test::More.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-diff -up Package-Stash-0.22/t/01-basic.t.orig Package-Stash-0.22/t/01-basic.t
---- Package-Stash-0.22/t/01-basic.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/01-basic.t	2011-01-06 09:42:32.847715002 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 122;
- use Test::Fatal;
- 
- use Package::Stash;
-@@ -416,5 +416,3 @@ like(exception {
-         "list_all_symbols CODE",
-     );
- }
--
--done_testing;
-diff -up Package-Stash-0.22/t/02-extension.t.orig Package-Stash-0.22/t/02-extension.t
---- Package-Stash-0.22/t/02-extension.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/02-extension.t	2011-01-06 09:42:32.868715618 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 15;
- use Test::Fatal;
- 
- {
-@@ -70,5 +70,3 @@ is(exception {
- }, undef, '... created %Foo::baz successfully');
- 
- ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
--
--done_testing;
-diff -up Package-Stash-0.22/t/03-io.t.orig Package-Stash-0.22/t/03-io.t
---- Package-Stash-0.22/t/03-io.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/03-io.t	2011-01-06 09:42:32.868715618 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 11;
- use Test::Fatal;
- 
- {
-@@ -47,5 +47,3 @@ use Package::Stash;
-     ok($stash->has_symbol('baz'), "has baz");
-     is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz");
- }
--
--done_testing;
-diff -up Package-Stash-0.22/t/04-get.t.orig Package-Stash-0.22/t/04-get.t
---- Package-Stash-0.22/t/04-get.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/04-get.t	2011-01-06 09:42:32.869715648 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 36;
- 
- use Package::Stash;
- use Scalar::Util;
-@@ -182,5 +182,3 @@ use Scalar::Util;
-              "stash has the right variable");
-     }
- }
--
--done_testing;
-diff -up Package-Stash-0.22/t/05-isa.t.orig Package-Stash-0.22/t/05-isa.t
---- Package-Stash-0.22/t/05-isa.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/05-isa.t	2011-01-06 09:42:32.870715677 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 1;
- 
- use Package::Stash;
- 
-@@ -17,6 +17,7 @@ use Package::Stash;
- my $stash = Package::Stash->new('Foo');
- my @ISA = ('Bar');
- @{$stash->get_or_add_symbol('@ISA')} = @ISA;
-+SKIP: {
-+skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
- isa_ok('Foo', 'Bar');
--
--done_testing;
-+}
-diff -up Package-Stash-0.22/t/06-addsub.t.orig Package-Stash-0.22/t/06-addsub.t
---- Package-Stash-0.22/t/06-addsub.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/06-addsub.t	2011-01-06 09:42:32.870715677 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 7;
- use Test::Fatal;
- 
- BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
-@@ -42,5 +42,3 @@ $foo_stash->add_symbol(
- 
- is $DB::sub{'Foo::dunk'}, sprintf "%s:%d-%d", "FileName", 100, 199,
-     '... got the right %DB::sub value for dunk with specified args';
--
--done_testing;
-diff -up Package-Stash-0.22/t/07-edge-cases.t.orig Package-Stash-0.22/t/07-edge-cases.t
---- Package-Stash-0.22/t/07-edge-cases.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/07-edge-cases.t	2011-01-06 09:43:05.438672195 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 14;
- use Test::Fatal;
- 
- use Package::Stash;
-@@ -65,5 +65,3 @@ is(exception { $Bar->add_symbol('$bar', 
-    "can add PVNV values");
- 
- use_ok('CompileTime');
--
--done_testing;
-diff -up Package-Stash-0.22/t/10-synopsis.t.orig Package-Stash-0.22/t/10-synopsis.t
---- Package-Stash-0.22/t/10-synopsis.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/10-synopsis.t	2011-01-06 09:42:32.871715706 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
--use Test::More;
-+use Test::More tests => 3;
- 
- use Package::Stash;
- 
-@@ -15,5 +15,3 @@ $stash->add_symbol('%foo', {bar => 1});
- ok(!$stash->has_symbol('$foo'), "doesn't have anything in scalar slot");
- my $namespace = $stash->namespace;
- is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
--
--done_testing;
-diff -up Package-Stash-0.22/t/20-leaks.t.orig Package-Stash-0.22/t/20-leaks.t
---- Package-Stash-0.22/t/20-leaks.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/20-leaks.t	2011-01-06 09:42:32.872715736 +0000
-@@ -5,6 +5,7 @@ use lib 't/lib';
- use Test::More;
- use Test::Fatal;
- use Test::Requires 'Test::LeakTrace';
-+plan tests => 25;
- 
- use Package::Stash;
- use Symbol;
-@@ -136,7 +137,10 @@ use Symbol;
-     ok($foo->has_symbol('@ISA'));
-     is(ref($foo->get_symbol('@ISA')), 'ARRAY');
-     is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
-+    SKIP: {
-+    skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
-     isa_ok('Foo', 'Exporter');
-+    }
- }
- 
- {
-@@ -190,5 +194,3 @@ use Symbol;
-         eval { $foo->get_or_add_symbol('&blorg') };
-     } "doesn't leak on errors";
- }
--
--done_testing;
-diff -up Package-Stash-0.22/t/21-leaks-debug.t.orig Package-Stash-0.22/t/21-leaks-debug.t
---- Package-Stash-0.22/t/21-leaks-debug.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/21-leaks-debug.t	2011-01-06 09:42:32.872715736 +0000
-@@ -5,6 +5,7 @@ use lib 't/lib';
- use Test::More;
- use Test::Fatal;
- use Test::Requires 'Test::LeakTrace';
-+plan tests => 25;
- 
- BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
- 
-@@ -138,7 +139,10 @@ use Symbol;
-     ok($foo->has_symbol('@ISA'));
-     is(ref($foo->get_symbol('@ISA')), 'ARRAY');
-     is_deeply($foo->get_symbol('@ISA'), ['Exporter']);
-+    SKIP: {
-+    skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
-     isa_ok('Foo', 'Exporter');
-+    }
- }
- 
- {
-@@ -192,5 +196,3 @@ use Symbol;
-         eval { $foo->get_or_add_symbol('&blorg') };
-     } "doesn't leak on errors";
- }
--
--done_testing;
-diff -up Package-Stash-0.22/t/impl-selection/01-choice.t.orig Package-Stash-0.22/t/impl-selection/01-choice.t
---- Package-Stash-0.22/t/impl-selection/01-choice.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/impl-selection/01-choice.t	2011-01-06 09:42:32.873715766 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 2;
- 
- my $has_xs = eval "require Package::Stash::XS; 1";
- 
-@@ -13,5 +13,3 @@ my $expected = $has_xs ? 'XS' : 'PP';
- is($Package::Stash::IMPLEMENTATION, $expected,
-    "autodetected properly: $expected");
- can_ok('Package::Stash', 'new');
--
--done_testing;
-diff -up Package-Stash-0.22/t/impl-selection/02-env.t.orig Package-Stash-0.22/t/impl-selection/02-env.t
---- Package-Stash-0.22/t/impl-selection/02-env.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/impl-selection/02-env.t	2011-01-06 09:42:32.874715795 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 4;
- 
- # XXX: work around dumb core segfault bug when you delete stashes
- sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
-@@ -25,5 +25,3 @@ SKIP: {
-     is(get_impl, 'XS', "autodetected properly: XS");
-     can_ok('Package::Stash', 'new');
- }
--
--done_testing;
-diff -up Package-Stash-0.22/t/impl-selection/03-var.t.orig Package-Stash-0.22/t/impl-selection/03-var.t
---- Package-Stash-0.22/t/impl-selection/03-var.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/impl-selection/03-var.t	2011-01-06 09:42:32.874715795 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 4;
- 
- # XXX: work around dumb core segfault bug when you delete stashes
- sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
-@@ -25,5 +25,3 @@ SKIP: {
-     is(get_impl, 'XS', "autodetected properly: XS");
-     can_ok('Package::Stash', 'new');
- }
--
--done_testing;
-diff -up Package-Stash-0.22/t/impl-selection/10-basic-pp.t.orig Package-Stash-0.22/t/impl-selection/10-basic-pp.t
---- Package-Stash-0.22/t/impl-selection/10-basic-pp.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/impl-selection/10-basic-pp.t	2011-01-06 09:42:32.875715824 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 124;
- use Test::Fatal;
- 
- BEGIN { $Package::Stash::IMPLEMENTATION = 'PP' }
-@@ -420,5 +420,3 @@ like(exception {
-         "list_all_symbols CODE",
-     );
- }
--
--done_testing;
-diff -up Package-Stash-0.22/t/impl-selection/11-basic-xs.t.orig Package-Stash-0.22/t/impl-selection/11-basic-xs.t
---- Package-Stash-0.22/t/impl-selection/11-basic-xs.t.orig	2011-01-06 05:16:45.000000000 +0000
-+++ Package-Stash-0.22/t/impl-selection/11-basic-xs.t	2011-01-06 09:42:32.875715824 +0000
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 124;
- use Test::Fatal;
- use Test::Requires 'Package::Stash::XS';
- 
-@@ -421,5 +421,3 @@ like(exception {
-         "list_all_symbols CODE",
-     );
- }
--
--done_testing;
diff --git a/Package-Stash-0.23-EU::MM-version.patch b/Package-Stash-0.23-EU::MM-version.patch
new file mode 100644
index 0000000..b3f0fa2
--- /dev/null
+++ b/Package-Stash-0.23-EU::MM-version.patch
@@ -0,0 +1,30 @@
+--- Package-Stash-0.23/Makefile.PL.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/Makefile.PL	2011-01-12 09:40:40.425398934 +0000
+@@ -3,7 +3,7 @@
+ BEGIN { require 5.8.1; }
+ use strict;
+ use warnings;
+-use ExtUtils::MakeMaker 6.31;
++use ExtUtils::MakeMaker;
+ check_conflicts();
+ 
+ my %WriteMakefileArgs = (
+@@ -15,7 +15,7 @@
+   },
+   'CONFIGURE_REQUIRES' => {
+     'Dist::CheckConflicts' => '0.01',
+-    'ExtUtils::MakeMaker' => '6.31'
++    'ExtUtils::MakeMaker' => '0'
+   },
+   'DISTNAME' => 'Package-Stash',
+   'EXE_FILES' => [
+@@ -51,6 +51,9 @@
+ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+ 
++delete $WriteMakefileArgs{LICENSE}
++  unless eval { ExtUtils::MakeMaker->VERSION(6.31) };
++
+ delete $WriteMakefileArgs{PREREQ_PM}{'Package::Stash::XS'}
+   unless can_cc();
+ 
diff --git a/Package-Stash-0.23-no-Test::LeakTrace.patch b/Package-Stash-0.23-no-Test::LeakTrace.patch
new file mode 100644
index 0000000..a66dacd
--- /dev/null
+++ b/Package-Stash-0.23-no-Test::LeakTrace.patch
@@ -0,0 +1,26 @@
+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.23-no-Test::Requires.patch b/Package-Stash-0.23-no-Test::Requires.patch
new file mode 100644
index 0000000..69d264d
--- /dev/null
+++ b/Package-Stash-0.23-no-Test::Requires.patch
@@ -0,0 +1,11 @@
+--- Package-Stash-0.23/t/impl-selection/11-basic-xs.t	2011-01-04 16:31:03.410468453 +0000
++++ Package-Stash-0.23/t/impl-selection/11-basic-xs.t	2011-01-04 16:31:03.413468538 +0000
+@@ -3,7 +3,7 @@ use strict;
+ use warnings;
+ use Test::More tests => 124;
+ use Test::Fatal;
+-use Test::Requires 'Package::Stash::XS';
++use Package::Stash::XS;
+ 
+ BEGIN { $Package::Stash::IMPLEMENTATION = 'XS' }
+ 
diff --git a/Package-Stash-0.23-old-Test::More.patch b/Package-Stash-0.23-old-Test::More.patch
new file mode 100644
index 0000000..d303123
--- /dev/null
+++ b/Package-Stash-0.23-old-Test::More.patch
@@ -0,0 +1,296 @@
+diff -up Package-Stash-0.23/t/01-basic.t.orig Package-Stash-0.23/t/01-basic.t
+--- Package-Stash-0.23/t/01-basic.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/01-basic.t	2011-01-12 09:43:15.946857521 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 122;
+ use Test::Fatal;
+ 
+ use Package::Stash;
+@@ -416,5 +416,3 @@ like(exception {
+         "list_all_symbols CODE",
+     );
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/02-extension.t.orig Package-Stash-0.23/t/02-extension.t
+--- Package-Stash-0.23/t/02-extension.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/02-extension.t	2011-01-12 09:43:15.963858007 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 15;
+ use Test::Fatal;
+ 
+ {
+@@ -70,5 +70,3 @@ is(exception {
+ }, undef, '... created %Foo::baz successfully');
+ 
+ ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/03-io.t.orig Package-Stash-0.23/t/03-io.t
+--- Package-Stash-0.23/t/03-io.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/03-io.t	2011-01-12 09:43:15.963858007 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 11;
+ use Test::Fatal;
+ 
+ {
+@@ -47,5 +47,3 @@ use Package::Stash;
+     ok($stash->has_symbol('baz'), "has baz");
+     is($stash->get_symbol('baz'), *Foo::foo{IO}, "got the right baz");
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/04-get.t.orig Package-Stash-0.23/t/04-get.t
+--- Package-Stash-0.23/t/04-get.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/04-get.t	2011-01-12 09:43:15.964858036 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 36;
+ 
+ use Package::Stash;
+ use Scalar::Util;
+@@ -182,5 +182,3 @@ use Scalar::Util;
+              "stash has the right variable");
+     }
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/05-isa.t.orig Package-Stash-0.23/t/05-isa.t
+--- Package-Stash-0.23/t/05-isa.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/05-isa.t	2011-01-12 09:43:15.965858065 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 1;
+ 
+ use Package::Stash;
+ 
+@@ -17,6 +17,7 @@ use Package::Stash;
+ my $stash = Package::Stash->new('Foo');
+ my @ISA = ('Bar');
+ @{$stash->get_or_add_symbol('@ISA')} = @ISA;
++SKIP: {
++skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
+ isa_ok('Foo', 'Bar');
+-
+-done_testing;
++}
+diff -up Package-Stash-0.23/t/06-addsub.t.orig Package-Stash-0.23/t/06-addsub.t
+--- Package-Stash-0.23/t/06-addsub.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/06-addsub.t	2011-01-12 09:43:15.965858065 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 7;
+ use Test::Fatal;
+ 
+ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
+@@ -42,5 +42,3 @@ $foo_stash->add_symbol(
+ 
+ is $DB::sub{'Foo::dunk'}, sprintf "%s:%d-%d", "FileName", 100, 199,
+     '... got the right %DB::sub value for dunk with specified args';
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/07-edge-cases.t.orig Package-Stash-0.23/t/07-edge-cases.t
+--- Package-Stash-0.23/t/07-edge-cases.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/07-edge-cases.t	2011-01-12 09:43:15.966858093 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 14;
+ use Test::Fatal;
+ 
+ use Package::Stash;
+@@ -65,5 +65,3 @@ is(exception { $Bar->add_symbol('$bar', 
+    "can add PVNV values");
+ 
+ use_ok('CompileTime');
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/10-synopsis.t.orig Package-Stash-0.23/t/10-synopsis.t
+--- Package-Stash-0.23/t/10-synopsis.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/10-synopsis.t	2011-01-12 09:43:15.966858093 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 3;
+ 
+ use Package::Stash;
+ 
+@@ -15,5 +15,3 @@ $stash->add_symbol('%foo', {bar => 1});
+ ok(!$stash->has_symbol('$foo'), "doesn't have anything in scalar slot");
+ my $namespace = $stash->namespace;
+ is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/impl-selection/01-choice.t.orig Package-Stash-0.23/t/impl-selection/01-choice.t
+--- Package-Stash-0.23/t/impl-selection/01-choice.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/impl-selection/01-choice.t	2011-01-12 09:43:15.969858179 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 2;
+ 
+ my $has_xs = eval "require Package::Stash::XS; 1";
+ 
+@@ -13,5 +13,3 @@ my $expected = $has_xs ? 'XS' : 'PP';
+ is($Package::Stash::IMPLEMENTATION, $expected,
+    "autodetected properly: $expected");
+ can_ok('Package::Stash', 'new');
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/impl-selection/02-env.t.orig Package-Stash-0.23/t/impl-selection/02-env.t
+--- Package-Stash-0.23/t/impl-selection/02-env.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/impl-selection/02-env.t	2011-01-12 09:43:15.969858179 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 4;
+ 
+ # XXX: work around dumb core segfault bug when you delete stashes
+ sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
+@@ -25,5 +25,3 @@ SKIP: {
+     is(get_impl, 'XS', "autodetected properly: XS");
+     can_ok('Package::Stash', 'new');
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/impl-selection/03-var.t.orig Package-Stash-0.23/t/impl-selection/03-var.t
+--- Package-Stash-0.23/t/impl-selection/03-var.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/impl-selection/03-var.t	2011-01-12 09:43:15.970858208 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 4;
+ 
+ # XXX: work around dumb core segfault bug when you delete stashes
+ sub get_impl { eval '$Package::Stash::IMPLEMENTATION' }
+@@ -25,5 +25,3 @@ SKIP: {
+     is(get_impl, 'XS', "autodetected properly: XS");
+     can_ok('Package::Stash', 'new');
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/impl-selection/10-basic-pp.t.orig Package-Stash-0.23/t/impl-selection/10-basic-pp.t
+--- Package-Stash-0.23/t/impl-selection/10-basic-pp.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/impl-selection/10-basic-pp.t	2011-01-12 09:43:15.971858237 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 124;
+ use Test::Fatal;
+ 
+ BEGIN { $Package::Stash::IMPLEMENTATION = 'PP' }
+@@ -420,5 +420,3 @@ like(exception {
+         "list_all_symbols CODE",
+     );
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.23/t/impl-selection/11-basic-xs.t.orig Package-Stash-0.23/t/impl-selection/11-basic-xs.t
+--- Package-Stash-0.23/t/impl-selection/11-basic-xs.t.orig	2011-01-11 17:44:23.000000000 +0000
++++ Package-Stash-0.23/t/impl-selection/11-basic-xs.t	2011-01-12 09:43:15.972858265 +0000
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 124;
+ use Test::Fatal;
+ use Test::Requires 'Package::Stash::XS';
+ 
+@@ -421,5 +421,3 @@ like(exception {
+         "list_all_symbols CODE",
+     );
+ }
+-
+-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
+@@ -14,6 +14,8 @@ use Test::More;
+ use Test::Fatal;
+ use Test::LeakTrace;
+ 
++plan tests => 25;
++
+ use Package::Stash;
+ 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']);
++    SKIP: {
++    skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
+     isa_ok('Foo', 'Exporter');
++    }
+ }
+ 
+ {
+@@ -198,5 +203,3 @@ use Symbol;
+         eval { $foo->get_or_add_symbol('&blorg') };
+     } "doesn't leak on errors";
+ }
+-
+-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
+@@ -14,6 +14,8 @@ use Test::More;
+ use Test::Fatal;
+ use Test::LeakTrace;
+ 
++plan tests => 25;
++
+ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
+ 
+ use Package::Stash;
+@@ -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']);
++    SKIP: {
++    skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
+     isa_ok('Foo', 'Exporter');
++    }
+ }
+ 
+ {
+@@ -200,5 +205,3 @@ use Symbol;
+         eval { $foo->get_or_add_symbol('&blorg') };
+     } "doesn't leak on errors";
+ }
+-
+-done_testing;
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 3769307..9078c74 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -5,16 +5,17 @@
 %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.22
+Version:	0.23
 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
-Patch0:		Package-Stash-0.22-EU::MM-version.patch
-Patch1:		Package-Stash-0.22-old-Test::More.patch
-Patch2:		Package-Stash-0.20-no-Test::Requires.patch
+Patch0:		Package-Stash-0.23-EU::MM-version.patch
+Patch1:		Package-Stash-0.23-old-Test::More.patch
+Patch2:		Package-Stash-0.23-no-Test::Requires.patch
+Patch3:		Package-Stash-0.23-no-Test::LeakTrace.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(Dist::CheckConflicts)
@@ -70,6 +71,11 @@ a simple API.
 %patch2 -p1
 %endif
 
+# Skip the memory leak tests if we don't have Test::LeakTrace
+%if "%{?rhel}" == "4" || "%{?rhel}" == "5"
+%patch3 -p1
+%endif
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -96,6 +102,13 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash::PP.3pm*
 
 %changelog
+* Wed Jan 12 2011 Paul Howarth <paul@city-fan.org> - 0.23-1
+- Update to 0.23
+  - Lower perl prereq to 5.8.1
+  - Make the leak tests release-only
+- Update patches to apply cleanly
+- Add patch to skip memory leak tests if we don't have Test::LeakTrace
+
 * Thu Jan  6 2011 Paul Howarth <paul@city-fan.org> - 0.22-1
 - Update to 0.22 (bump Package::Stash::XS version requirement since a bug was
   fixed there)
diff --git a/sources b/sources
index 4d65c89..f7658ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8107a40643f492ce7598e0d50a0f6907  Package-Stash-0.22.tar.gz
+334edfc7dc44f9186535782c6d700f9b  Package-Stash-0.23.tar.gz