Update to 0.23

- New upstream release 0.23 - Fix the test for scalar values, again - Disallow assigning globrefs to scalar glob slots (this doesn't actually make any sense) - Update patches for old ExtUtils::MakeMaker and Test::More versions - perl(Pod::Coverage::TrustPod) now available in EPEL-4 too - Don't use macros for commands
2011-08-09 13:18:03 +01:00 · 2011-08-09 13:18:03 +01:00 · 06d92dfd5b
commit 06d92dfd5b
parent 69f740c3a7
6 changed files with 280 additions and 224 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/Package-Stash-XS-0.22.tar.gz
+/Package-Stash-XS-[0-9]*.tar.gz
--- a/Package-Stash-XS-0.22-old-Test::More.patch
+++ b/Package-Stash-XS-0.22-old-Test::More.patch
@ -1,206 +0,0 @@
-diff -up Package-Stash-XS-0.22/t/01-basic.t.tm Package-Stash-XS-0.22/t/01-basic.t
--- Package-Stash-XS-0.22/t/01-basic.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/01-basic.t	2011-03-05 09:45:46.463400267 +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-XS-0.22/t/02-extension.t.tm Package-Stash-XS-0.22/t/02-extension.t
--- Package-Stash-XS-0.22/t/02-extension.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/02-extension.t	2011-03-05 09:45:46.477402444 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
-use Test::More;
-+use Test::More tests => 15;
- use Test::Fatal;
- 
- {
-@@ -72,5 +72,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-XS-0.22/t/03-io.t.tm Package-Stash-XS-0.22/t/03-io.t
--- Package-Stash-XS-0.22/t/03-io.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/03-io.t	2011-03-05 09:45:46.477402444 +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-XS-0.22/t/04-get.t.tm Package-Stash-XS-0.22/t/04-get.t
--- Package-Stash-XS-0.22/t/04-get.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/04-get.t	2011-03-05 09:45:46.477402444 +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-XS-0.22/t/05-isa.t.tm Package-Stash-XS-0.22/t/05-isa.t
--- Package-Stash-XS-0.22/t/05-isa.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/05-isa.t	2011-03-05 09:45:46.478402600 +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-XS-0.22/t/06-addsub.t.tm Package-Stash-XS-0.22/t/06-addsub.t
--- Package-Stash-XS-0.22/t/06-addsub.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/06-addsub.t	2011-03-05 09:45:46.478402600 +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-XS-0.22/t/07-edge-cases.t.tm Package-Stash-XS-0.22/t/07-edge-cases.t
--- Package-Stash-XS-0.22/t/07-edge-cases.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/07-edge-cases.t	2011-03-05 09:46:27.063715248 +0000
-@@ -2,7 +2,7 @@
- use strict;
- use warnings;
- use lib 't/lib';
-use Test::More;
-+use Test::More tests => 16;
- use Test::Fatal;
- 
- use Package::Stash;
-@@ -80,5 +80,3 @@ use_ok('CompileTime');
-     }
-     ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted");
- }
-
-done_testing;
-diff -up Package-Stash-XS-0.22/t/10-synopsis.t.tm Package-Stash-XS-0.22/t/10-synopsis.t
--- Package-Stash-XS-0.22/t/10-synopsis.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/10-synopsis.t	2011-03-05 09:45:46.479402756 +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-XS-0.22/t/author-20-leaks.t.tm Package-Stash-XS-0.22/t/author-20-leaks.t
--- Package-Stash-XS-0.22/t/author-20-leaks.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/author-20-leaks.t	2011-03-05 09:45:46.480402911 +0000
-@@ -17,6 +17,8 @@ use Test::LeakTrace;
- use Package::Stash;
- use Symbol;
- 
-+plan tests => 25;
-+
- {
-     package Bar;
- }
-@@ -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-XS-0.22/t/author-21-leaks-debug.t.tm Package-Stash-XS-0.22/t/author-21-leaks-debug.t
--- Package-Stash-XS-0.22/t/author-21-leaks-debug.t.tm	2011-03-04 19:12:28.000000000 +0000
-+++ Package-Stash-XS-0.22/t/author-21-leaks-debug.t	2011-03-05 09:45:46.480402911 +0000
-@@ -19,6 +19,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
- use Package::Stash;
- use Symbol;
- 
-+plan tests => 25;
-+
- {
-     package Bar;
- }
-@@ -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;
--- a/Package-Stash-XS-0.23-old-Test::More.patch
+++ b/Package-Stash-XS-0.23-old-Test::More.patch
@ -0,0 +1,255 @@
+diff -up Package-Stash-XS-0.23/t/addsub.t.orig Package-Stash-XS-0.23/t/addsub.t
+--- Package-Stash-XS-0.23/t/addsub.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/addsub.t	2011-08-09 09:21:01.223844899 +0100
+@@ -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-XS-0.23/t/author-20-leaks.t.orig Package-Stash-XS-0.23/t/author-20-leaks.t
+--- Package-Stash-XS-0.23/t/author-20-leaks.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/author-20-leaks.t	2011-08-09 09:21:01.309844685 +0100
+@@ -17,6 +17,8 @@ use Test::LeakTrace;
+ use Package::Stash;
+ use Symbol;
+ 
+plan tests => 25;
+
+ {
+     package Bar;
+ }
+@@ -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-XS-0.23/t/author-21-leaks-debug.t.orig Package-Stash-XS-0.23/t/author-21-leaks-debug.t
+--- Package-Stash-XS-0.23/t/author-21-leaks-debug.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/author-21-leaks-debug.t	2011-08-09 09:21:01.310844682 +0100
+@@ -19,6 +19,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
+ use Package::Stash;
+ use Symbol;
+ 
+plan tests => 25;
+
+ {
+     package Bar;
+ }
+@@ -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 -up Package-Stash-XS-0.23/t/basic.t.orig Package-Stash-XS-0.23/t/basic.t
+--- Package-Stash-XS-0.23/t/basic.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/basic.t	2011-08-09 09:21:01.085845240 +0100
+@@ -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-XS-0.23/t/compile-time.t.orig Package-Stash-XS-0.23/t/compile-time.t
+--- Package-Stash-XS-0.23/t/compile-time.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/compile-time.t	2011-08-09 09:22:00.372698489 +0100
+@@ -2,8 +2,6 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
+use Test::More tests => 1;
+ 
+ use_ok('CompileTime');
+-
+-done_testing;
+diff -up Package-Stash-XS-0.23/t/edge-cases.t.orig Package-Stash-XS-0.23/t/edge-cases.t
+--- Package-Stash-XS-0.23/t/edge-cases.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/edge-cases.t	2011-08-09 09:21:27.243780482 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
+use Test::More tests => 11;
+ use Test::Fatal;
+ 
+ use Package::Stash;
+@@ -52,5 +52,3 @@ is(ref($constant), 'CODE', "expanded a c
+ # was here)
+ is(ref($stash->get_symbol('$glob')), '', "nothing yet");
+ is(ref($stash->get_or_add_symbol('$glob')), 'SCALAR', "got an empty scalar");
+-
+-done_testing;
+diff -up Package-Stash-XS-0.23/t/extension.t.orig Package-Stash-XS-0.23/t/extension.t
+--- Package-Stash-XS-0.23/t/extension.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/extension.t	2011-08-09 09:21:01.122845149 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
+use Test::More tests => 15;
+ use Test::Fatal;
+ 
+ {
+@@ -72,5 +72,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-XS-0.23/t/get.t.orig Package-Stash-XS-0.23/t/get.t
+--- Package-Stash-XS-0.23/t/get.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/get.t	2011-08-09 09:21:01.167845036 +0100
+@@ -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-XS-0.23/t/io.t.orig Package-Stash-XS-0.23/t/io.t
+--- Package-Stash-XS-0.23/t/io.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/io.t	2011-08-09 09:21:01.151845076 +0100
+@@ -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-XS-0.23/t/isa.t.orig Package-Stash-XS-0.23/t/isa.t
+--- Package-Stash-XS-0.23/t/isa.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/isa.t	2011-08-09 09:21:01.199844957 +0100
+@@ -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-XS-0.23/t/scalar-values.t.orig Package-Stash-XS-0.23/t/scalar-values.t
+--- Package-Stash-XS-0.23/t/scalar-values.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/scalar-values.t	2011-08-09 09:22:00.396698428 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
+use Test::More tests => 14;
+ use Test::Fatal;
+ 
+ use B;
+@@ -49,5 +49,3 @@ my $vstring = v1.2.3;
+ is(reftype(\$vstring), ($] < 5.010 ? 'SCALAR' : 'VSTRING'));
+ is(exception { $Bar->add_symbol('$vstring', \$vstring) }, undef,
+    "can add vstring values");
+-
+-done_testing;
+diff -up Package-Stash-XS-0.23/t/stash-deletion.t.orig Package-Stash-XS-0.23/t/stash-deletion.t
+--- Package-Stash-XS-0.23/t/stash-deletion.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/stash-deletion.t	2011-08-09 09:22:00.396698428 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
+use Test::More tests => 2;
+ 
+ use Package::Stash;
+ 
+@@ -20,5 +20,3 @@ use Package::Stash;
+     }
+     ok(!$delete->has_symbol('&bar'), "method goes away when stash is deleted");
+ }
+-
+-done_testing;
+diff -up Package-Stash-XS-0.23/t/synopsis.t.orig Package-Stash-XS-0.23/t/synopsis.t
+--- Package-Stash-XS-0.23/t/synopsis.t.orig	2011-08-08 16:43:44.000000000 +0100
+++ Package-Stash-XS-0.23/t/synopsis.t	2011-08-09 09:21:01.274844771 +0100
+@@ -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;
--- a/Package-Stash-XS-0.23-old-eumm.patch
+++ b/Package-Stash-XS-0.23-old-eumm.patch
@ -1,10 +1,10 @@
--- 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
+--- Package-Stash-XS/Makefile.PL
+++ Package-Stash-XS/Makefile.PL
@@ -4,7 +4,7 @@
 
- BEGIN { require 5.8.1; }
+ use 5.008001;
 
-use ExtUtils::MakeMaker 6.31;
+-use ExtUtils::MakeMaker 6.30;
 +use ExtUtils::MakeMaker 6.17;
 
 
@ -13,7 +13,7 @@
     'Test::More' => '0.88'
   },
   'CONFIGURE_REQUIRES' => {
-    'ExtUtils::MakeMaker' => '6.31'
+-    'ExtUtils::MakeMaker' => '6.30'
 +    'ExtUtils::MakeMaker' => '6.17'
   },
   'DISTNAME' => 'Package-Stash-XS',
--- a/perl-Package-Stash-XS.spec
+++ b/perl-Package-Stash-XS.spec
@ -1,17 +1,18 @@
 Name:		perl-Package-Stash-XS
-Version:	0.22
-Release:	2%{?dist}
+Version:	0.23
+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.20-old-eumm.patch
-Patch1:		Package-Stash-XS-0.22-old-Test::More.patch
+Patch0:		Package-Stash-XS-0.23-old-eumm.patch
+Patch1:		Package-Stash-XS-0.23-old-Test::More.patch
 Patch2:		Package-Stash-XS-0.21-no-Test::LeakTrace.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	perl >= 3:5.8.1
 BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(Pod::Coverage::TrustPod)
 BuildRequires:	perl(Test::EOL)
 BuildRequires:	perl(Test::Fatal)
 BuildRequires:	perl(Test::More)
@ -22,10 +23,7 @@ BuildRequires:	perl(Test::Pod::Coverage)
 %if "%{?rhel}" != "4" && "%{?rhel}" != "5"
 BuildRequires:	perl(Test::LeakTrace) >= 0.11
 %endif
-%if "%{?rhel}" != "4"
-BuildRequires:	perl(Pod::Coverage::TrustPod)
-%endif
-Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))

 # Don't "provide" private Perl libs
 %{?perl_default_filter}
@ -38,7 +36,7 @@ installed, and should be preferred in all environments with a compiler.
 %prep
 %setup -q -n Package-Stash-XS-%{version}

-# Don't really need ExtUtils::MakeMaker >= 6.31
+# Don't really need ExtUtils::MakeMaker ≥ 6.30
 %if "%{?rhel}" == "4" || "%{?rhel}" == "5"
 %patch0 -p1
 %endif
@ -79,6 +77,15 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash::XS.3pm*

 %changelog
+* Tue Aug  9 2011 Paul Howarth <paul@city-fan.org> - 0.23-1
+- Update to 0.23
+  - Fix the test for scalar values, again
+  - Disallow assigning globrefs to scalar glob slots (this doesn't actually
+    make any sense)
+- Update patches for old ExtUtils::MakeMaker and Test::More versions
+- perl(Pod::Coverage::TrustPod) now available in EPEL-4 too
+- Don't use macros for commands
+
 * Tue Jul 19 2011 Petr Sabata <contyk@redhat.com> - 0.22-2
 - Perl mass rebuild

@ -112,7 +119,7 @@ rm -rf %{buildroot}
 - Update patch for old Test::More versions

 * Wed Nov 17 2010 Paul Howarth <paul@city-fan.org> - 0.17-2
- Santitize spec for Fedora submission
+- Sanitize spec for Fedora submission

 * Wed Nov 17 2010 Paul Howarth <paul@city-fan.org> - 0.17-1
 - Initial RPM build
--- a/2
+++ b/2
@ -1 +1 @@
-0c74faa792015e5e3eb852b10c9e1d72  Package-Stash-XS-0.22.tar.gz
+e238e932a2d579260b49c0f633165559  Package-Stash-XS-0.23.tar.gz