From 12f659e05babca8f5491221a84077cc9189420cb Mon Sep 17 00:00:00 2001
From: Paul Howarth <pghmcfc@fedoraproject.org>
Date: Mon, 14 Jun 2010 07:05:07 +0000
Subject: [PATCH 01/10] Initial import of perl-Package-Stash-0.03-1

---
 .cvsignore              |  1 +
 perl-Package-Stash.spec | 53 +++++++++++++++++++++++++++++++++++++++++
 sources                 |  1 +
 3 files changed, 55 insertions(+)
 create mode 100644 perl-Package-Stash.spec

diff --git a/.cvsignore b/.cvsignore
index e69de29..5ae6a64 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+Package-Stash-0.03.tar.gz
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
new file mode 100644
index 0000000..5a0d74c
--- /dev/null
+++ b/perl-Package-Stash.spec
@@ -0,0 +1,53 @@
+Name:		perl-Package-Stash
+Version:	0.03
+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
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+BuildRequires:	perl(ExtUtils::MakeMaker)
+BuildRequires:	perl(Scalar::Util)
+BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(Test::Exception)
+BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::Pod)
+BuildRequires:	perl(Test::Pod::Coverage)
+Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+
+%description
+Manipulating stashes (Perl's symbol tables) is occasionally necessary, but
+incredibly messy, and easy to get wrong. This module hides all of that behind
+a simple API.
+
+%prep
+%setup -q -n Package-Stash-%{version}
+
+%build
+perl Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
+%{_fixperms} %{buildroot}
+
+%check
+make test RELEASE_TESTING=1
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc Changes LICENSE README
+%{perl_vendorlib}/Package/
+%{_mandir}/man3/Package::Stash.3pm*
+
+%changelog
+* Mon Jun  7 2010 Paul Howarth <paul@city-fan.org> - 0.03-1
+- Initial RPM version
diff --git a/sources b/sources
index e69de29..c2e0b8d 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ba2ef213adbab1c82244a170ad9d4475  Package-Stash-0.03.tar.gz

From 87e5a2bc84c1ca07b48edb718a975241da21d420 Mon Sep 17 00:00:00 2001
From: Paul Howarth <pghmcfc@fedoraproject.org>
Date: Mon, 14 Jun 2010 08:10:38 +0000
Subject: [PATCH 02/10] - Incorporate package review suggestions (#602597) -
 Use %{?perl_default_filter} - Use DESTDIR instead of PERL_INSTALL_ROOT

---
 perl-Package-Stash.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 5a0d74c..c46d06a 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -1,6 +1,6 @@
 Name:		perl-Package-Stash
 Version:	0.03
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Routines for manipulating stashes
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -17,6 +17,8 @@ BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Pod::Coverage)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+%{?perl_default_filter}
+
 %description
 Manipulating stashes (Perl's symbol tables) is occasionally necessary, but
 incredibly messy, and easy to get wrong. This module hides all of that behind
@@ -31,7 +33,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make pure_install PERL_INSTALL_ROOT=%{buildroot}
+make pure_install DESTDIR=%{buildroot}
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
 %{_fixperms} %{buildroot}
@@ -49,5 +51,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash.3pm*
 
 %changelog
+* Mon Jun 14 2010 Paul Howarth <paul@city-fan.org> - 0.03-2
+- Incorporate package review suggestions (#602597)
+  - Use %%{?perl_default_filter}
+  - Use DESTDIR instead of PERL_INSTALL_ROOT
+
 * Mon Jun  7 2010 Paul Howarth <paul@city-fan.org> - 0.03-1
 - Initial RPM version

From c89c278fda96549b650863d6890b55e46af09f76 Mon Sep 17 00:00:00 2001
From: Paul Howarth <pghmcfc@fedoraproject.org>
Date: Mon, 14 Jun 2010 13:52:53 +0000
Subject: [PATCH 03/10] - Update to 0.04 (get_package_symbol now doesn't
 autovivify stash entries;     a new method get_or_add_package_symbol can now
 be used for that     behavior)

---
 .cvsignore              | 2 +-
 perl-Package-Stash.spec | 8 ++++++--
 sources                 | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 5ae6a64..6e67260 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Package-Stash-0.03.tar.gz
+Package-Stash-0.04.tar.gz
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index c46d06a..94efbd9 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -1,6 +1,6 @@
 Name:		perl-Package-Stash
-Version:	0.03
-Release:	2%{?dist}
+Version:	0.04
+Release:	1%{?dist}
 Summary:	Routines for manipulating stashes
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -51,6 +51,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash.3pm*
 
 %changelog
+* Mon Jul 14 2010 Paul Howarth <paul@city-fan.org> - 0.04-1
+- Update to 0.04 (get_package_symbol now doesn't autovivify stash entries; a
+  new method get_or_add_package_symbol can now be used for that behavior)
+
 * Mon Jun 14 2010 Paul Howarth <paul@city-fan.org> - 0.03-2
 - Incorporate package review suggestions (#602597)
   - Use %%{?perl_default_filter}
diff --git a/sources b/sources
index c2e0b8d..429cfed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba2ef213adbab1c82244a170ad9d4475  Package-Stash-0.03.tar.gz
+b96daf7f799fdb9d27871b13b3730bb5  Package-Stash-0.04.tar.gz

From fea07b5f60aabf61200b6601a7fc2b34d6d32145 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 07:42:22 +0000
Subject: [PATCH 04/10] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index aaaf0d7..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: perl-Package-Stash
-# $Id$
-NAME := perl-Package-Stash
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From 6730da510c01f5e302fa54174316bda90ccd7b33 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Fri, 30 Jul 2010 10:34:57 +0100
Subject: [PATCH 05/10] Update to 0.05

Update to latest upstream release, 0.05:
- Bump Test::More requirement for done_testing
- Update packaging stuff
BR: perl(Test::EOL) and perl(Test::NoTabs)
Unify spec for all active branches, adding patches for back-compatibility
---
 .gitignore                              |   2 +-
 Package-Stash-0.03-EU::MM-version.patch |  30 ++++++
 Package-Stash-0.05-old-Test::More.patch | 131 ++++++++++++++++++++++++
 perl-Package-Stash.spec                 |  36 ++++++-
 sources                                 |   2 +-
 5 files changed, 196 insertions(+), 5 deletions(-)
 create mode 100644 Package-Stash-0.03-EU::MM-version.patch
 create mode 100644 Package-Stash-0.05-old-Test::More.patch

diff --git a/.gitignore b/.gitignore
index 6e67260..862cf46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Package-Stash-0.04.tar.gz
+Package-Stash-0.05.tar.gz
diff --git a/Package-Stash-0.03-EU::MM-version.patch b/Package-Stash-0.03-EU::MM-version.patch
new file mode 100644
index 0000000..e0fb21d
--- /dev/null
+++ b/Package-Stash-0.03-EU::MM-version.patch
@@ -0,0 +1,30 @@
+--- Package-Stash-0.03/Makefile.PL	2010-05-14 17:41:34.000000000 +0100
++++ Package-Stash-0.03/Makefile.PL	2010-06-14 07:48:41.809872623 +0100
+@@ -4,7 +4,7 @@
+ 
+ 
+ 
+-use ExtUtils::MakeMaker 6.31;
++use ExtUtils::MakeMaker;
+ 
+ 
+ 
+@@ -13,7 +13,7 @@
+   'AUTHOR' => 'Jesse Luehrs <doy at tozt dot net>',
+   'BUILD_REQUIRES' => {},
+   'CONFIGURE_REQUIRES' => {
+-    'ExtUtils::MakeMaker' => '6.31'
++    'ExtUtils::MakeMaker' => '0'
+   },
+   'DISTNAME' => 'Package-Stash',
+   'EXE_FILES' => [],
+@@ -46,6 +46,9 @@
+ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+ 
++delete $WriteMakefileArgs{LICENSE}
++  unless eval { ExtUtils::MakeMaker->VERSION(6.31) };
++
+ WriteMakefile(%WriteMakefileArgs);
+ 
+ 
diff --git a/Package-Stash-0.05-old-Test::More.patch b/Package-Stash-0.05-old-Test::More.patch
new file mode 100644
index 0000000..ca53b80
--- /dev/null
+++ b/Package-Stash-0.05-old-Test::More.patch
@@ -0,0 +1,131 @@
+diff -up Package-Stash-0.05/t/01-basic.t.orig Package-Stash-0.05/t/01-basic.t
+--- Package-Stash-0.05/t/01-basic.t.orig	2010-05-14 17:41:34.000000000 +0100
++++ Package-Stash-0.05/t/01-basic.t	2010-06-07 09:53:18.570100938 +0100
+@@ -1,7 +1,7 @@
+ use strict;
+ use warnings;
+ 
+-use Test::More;
++use Test::More tests => 93;
+ use Test::Exception;
+ 
+ use Package::Stash;
+@@ -269,5 +269,3 @@ dies_ok {
+     ok(!$stash->has_package_symbol('&foo'), "got \&foo");
+     is($stash->get_package_symbol('foo'), *Baz::foo{IO}, "got foo");
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.05/t/02-extension.t.orig Package-Stash-0.05/t/02-extension.t
+--- Package-Stash-0.05/t/02-extension.t.orig	2010-05-14 17:41:34.000000000 +0100
++++ Package-Stash-0.05/t/02-extension.t	2010-06-07 09:53:18.571099744 +0100
+@@ -1,7 +1,7 @@
+ use strict;
+ use warnings;
+ 
+-use Test::More;
++use Test::More tests => 15;
+ use Test::Exception;
+ 
+ {
+@@ -66,5 +66,3 @@ lives_ok {
+ } '... created %Foo::baz successfully';
+ 
+ ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
+-
+-done_testing;
+diff -up Package-Stash-0.05/t/03-io.t.orig Package-Stash-0.05/t/03-io.t
+--- Package-Stash-0.05/t/03-io.t.orig	2010-05-14 17:41:34.000000000 +0100
++++ Package-Stash-0.05/t/03-io.t	2010-06-07 09:53:18.575099708 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 11;
+ use Test::Exception;
+ 
+ {
+@@ -46,5 +46,3 @@ use Package::Stash;
+     ok($stash->has_package_symbol('baz'), "has baz");
+     is($stash->get_package_symbol('baz'), *Foo::foo{IO}, "got the right baz");
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.05/t/04-get.t.orig Package-Stash-0.05/t/04-get.t
+--- Package-Stash-0.05/t/04-get.t.orig	2010-06-13 18:13:45.000000000 +0100
++++ Package-Stash-0.05/t/04-get.t	2010-06-14 14:32:39.855811492 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 10;
+ 
+ use Package::Stash;
+ 
+@@ -62,5 +62,3 @@
+     is_deeply($stash->get_or_add_package_symbol('@foo'), [1],
+             "got the right variable");
+ }
+-
+-done_testing;
+diff -up Package-Stash-0.05/t/05-isa.t.orig Package-Stash-0.05/t/05-isa.t
+--- Package-Stash-0.05/t/05-isa.t.orig	2010-05-14 17:41:34.000000000 +0100
++++ Package-Stash-0.05/t/05-isa.t	2010-06-07 09:55:14.591128547 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 1;
+ 
+ use Package::Stash;
+ 
+@@ -16,6 +16,8 @@ use Package::Stash;
+ my $stash = Package::Stash->new('Foo');
+ my @ISA = ('Bar');
+ @{$stash->get_package_symbol('@ISA')} = @ISA;
+-isa_ok('Foo', 'Bar');
+ 
+-done_testing;
++SKIP: {
++skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
++isa_ok('Foo', 'Bar');
++}
+diff -up Package-Stash-0.05/t/06-addsub.t.orig Package-Stash-0.05/t/06-addsub.t
+--- Package-Stash-0.05/t/06-addsub.t.orig	2010-06-13 18:13:45.000000000 +0100
++++ Package-Stash-0.05/t/06-addsub.t	2010-06-14 14:14:10.462975877 +0100
+@@ -1,7 +1,7 @@
+ use strict;
+ use warnings;
+ 
+-use Test::More;
++use Test::More tests => 7;
+ use Test::Exception;
+ 
+ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
+@@ -41,5 +41,3 @@
+ 
+ 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.05/t/10-synopsis.t.orig Package-Stash-0.05/t/10-synopsis.t
+--- Package-Stash-0.05/t/10-synopsis.t.orig	2010-05-14 17:41:34.000000000 +0100
++++ Package-Stash-0.05/t/10-synopsis.t	2010-06-07 09:53:18.596164680 +0100
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
+-use Test::More;
++use Test::More tests => 3;
+ 
+ use Package::Stash;
+ 
+@@ -14,5 +14,3 @@ $stash->add_package_symbol('%foo', {bar 
+ ok(!$stash->has_package_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 --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 94efbd9..abe4876 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -1,20 +1,33 @@
+# We need to patch the test suite if we have an old version of Test::More
+%global old_test_more %(perl -MTest::More -e 'printf "%d\\n", $Test::More::VERSION < 0.88 ? 1 : 0;' 2>/dev/null || echo 0)
+
+# We don't really need ExtUtils::MakeMaker > 6.31
+%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.04
+Version:	0.05
 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.03-EU::MM-version.patch
+Patch1:		Package-Stash-0.05-old-Test::More.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Scalar::Util)
-BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(Test::EOL)
 BuildRequires:	perl(Test::Exception)
 BuildRequires:	perl(Test::More)
+BuildRequires:	perl(Test::NoTabs)
 BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Pod::Coverage)
+# Pod::Coverage::TrustPod not yet in EPEL
+%if 0%{?fedora}
+BuildRequires:	perl(Pod::Coverage::TrustPod)
+%endif
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %{?perl_default_filter}
@@ -27,6 +40,16 @@ a simple API.
 %prep
 %setup -q -n Package-Stash-%{version}
 
+# Don't really need ExtUtils::MakeMaker >= 6.31
+%if %{old_eumm}
+%patch0 -p1
+%endif
+
+# Compatibility with old Test::More versions
+%if %{old_test_more}
+%patch1 -p1
+%endif
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -51,7 +74,14 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash.3pm*
 
 %changelog
-* Mon Jul 14 2010 Paul Howarth <paul@city-fan.org> - 0.04-1
+* Wed Jun 16 2010 Paul Howarth <paul@city-fan.org> - 0.05-1
+- Update to 0.05
+  - Bump Test::More requirement for done_testing
+  - Update packaging stuff
+- BR: perl(Test::EOL) and perl(Test::NoTabs)
+- Unify spec for all active branches, adding patches for back-compatibility
+
+* Mon Jun 14 2010 Paul Howarth <paul@city-fan.org> - 0.04-1
 - Update to 0.04 (get_package_symbol now doesn't autovivify stash entries; a
   new method get_or_add_package_symbol can now be used for that behavior)
 
diff --git a/sources b/sources
index 429cfed..08edc03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b96daf7f799fdb9d27871b13b3730bb5  Package-Stash-0.04.tar.gz
+d7b3857aca1f22b2da06cfcd3123cbef  Package-Stash-0.05.tar.gz

From 58da17c7ecd13974b3096aed3e6e3d3e10240b94 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Mon, 20 Sep 2010 12:01:30 +0100
Subject: [PATCH 06/10] Update to 0.08

Update to latest upstream release, 0.08:
- Re-enable the caching of the stash
Update patch for old ExtUtils::MakeMaker and Test::More versions
---
 .gitignore                                         |  2 +-
 ...atch => Package-Stash-0.08-EU::MM-version.patch | 12 ++++++------
 ...atch => Package-Stash-0.08-old-Test::More.patch | 14 +++++++-------
 perl-Package-Stash.spec                            | 10 +++++++---
 sources                                            |  2 +-
 5 files changed, 22 insertions(+), 18 deletions(-)
 rename Package-Stash-0.03-EU::MM-version.patch => Package-Stash-0.08-EU::MM-version.patch (67%)
 rename Package-Stash-0.05-old-Test::More.patch => Package-Stash-0.08-old-Test::More.patch (90%)

diff --git a/.gitignore b/.gitignore
index 862cf46..a0f482b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Package-Stash-0.05.tar.gz
+/Package-Stash-0.08.tar.gz
diff --git a/Package-Stash-0.03-EU::MM-version.patch b/Package-Stash-0.08-EU::MM-version.patch
similarity index 67%
rename from Package-Stash-0.03-EU::MM-version.patch
rename to Package-Stash-0.08-EU::MM-version.patch
index e0fb21d..1c5ece8 100644
--- a/Package-Stash-0.03-EU::MM-version.patch
+++ b/Package-Stash-0.08-EU::MM-version.patch
@@ -1,5 +1,5 @@
---- Package-Stash-0.03/Makefile.PL	2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.03/Makefile.PL	2010-06-14 07:48:41.809872623 +0100
+--- Package-Stash-0.08/Makefile.PL	2010-09-19 02:17:49.000000000 +0100
++++ Package-Stash-0.08/Makefile.PL	2010-09-20 11:34:35.619285663 +0100
 @@ -4,7 +4,7 @@
  
  
@@ -9,16 +9,16 @@
  
  
  
-@@ -13,7 +13,7 @@
-   'AUTHOR' => 'Jesse Luehrs <doy at tozt dot net>',
-   'BUILD_REQUIRES' => {},
+@@ -16,7 +16,7 @@
+     'Test::More' => '0.88'
+   },
    'CONFIGURE_REQUIRES' => {
 -    'ExtUtils::MakeMaker' => '6.31'
 +    'ExtUtils::MakeMaker' => '0'
    },
    'DISTNAME' => 'Package-Stash',
    'EXE_FILES' => [],
-@@ -46,6 +46,9 @@
+@@ -48,6 +48,9 @@
  delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
    unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
  
diff --git a/Package-Stash-0.05-old-Test::More.patch b/Package-Stash-0.08-old-Test::More.patch
similarity index 90%
rename from Package-Stash-0.05-old-Test::More.patch
rename to Package-Stash-0.08-old-Test::More.patch
index ca53b80..36caacf 100644
--- a/Package-Stash-0.05-old-Test::More.patch
+++ b/Package-Stash-0.08-old-Test::More.patch
@@ -1,18 +1,18 @@
-diff -up Package-Stash-0.05/t/01-basic.t.orig Package-Stash-0.05/t/01-basic.t
---- Package-Stash-0.05/t/01-basic.t.orig	2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.05/t/01-basic.t	2010-06-07 09:53:18.570100938 +0100
+diff -up Package-Stash-0.08/t/01-basic.t.orig Package-Stash-0.08/t/01-basic.t
+--- Package-Stash-0.08/t/01-basic.t.orig	2010-09-19 02:17:49.000000000 +0100
++++ Package-Stash-0.08/t/01-basic.t	2010-09-20 11:37:09.187162663 +0100
 @@ -1,7 +1,7 @@
  use strict;
  use warnings;
  
 -use Test::More;
-+use Test::More tests => 93;
++use Test::More tests => 110;
  use Test::Exception;
  
  use Package::Stash;
-@@ -269,5 +269,3 @@ dies_ok {
-     ok(!$stash->has_package_symbol('&foo'), "got \&foo");
-     is($stash->get_package_symbol('foo'), *Baz::foo{IO}, "got foo");
+@@ -323,5 +323,3 @@
+         );
+     }
  }
 -
 -done_testing;
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index abe4876..d224377 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -5,15 +5,15 @@
 %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.05
+Version:	0.08
 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.03-EU::MM-version.patch
-Patch1:		Package-Stash-0.05-old-Test::More.patch
+Patch0:		Package-Stash-0.08-EU::MM-version.patch
+Patch1:		Package-Stash-0.08-old-Test::More.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	perl(ExtUtils::MakeMaker)
@@ -74,6 +74,10 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash.3pm*
 
 %changelog
+* Mon Sep 20 2010 Paul Howarth <paul@city-fan.org> - 0.08-1
+- Update to 0.08 (re-enable the caching of the stash)
+- Update patch for old ExtUtils::MakeMaker and Test::More versions
+
 * Wed Jun 16 2010 Paul Howarth <paul@city-fan.org> - 0.05-1
 - Update to 0.05
   - Bump Test::More requirement for done_testing
diff --git a/sources b/sources
index 08edc03..03fc3ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7b3857aca1f22b2da06cfcd3123cbef  Package-Stash-0.05.tar.gz
+3a34ef6de7c428a29f72e019db11624d  Package-Stash-0.08.tar.gz

From d4772b4dfc2c964272d78fd50b3c02b56763cc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?=
 <mmaslano@redhat.com>
Date: Tue, 21 Dec 2010 11:29:05 +0100
Subject: [PATCH 07/10] - 661697 rebuild for fixing problems with vendorach/lib

---
 perl-Package-Stash.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index d224377..8951974 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -6,7 +6,7 @@
 
 Name:		perl-Package-Stash
 Version:	0.08
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Routines for manipulating stashes
 Group:		Development/Libraries
 License:	GPL+ or Artistic
@@ -74,6 +74,9 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Package::Stash.3pm*
 
 %changelog
+* Tue Dec 21 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.08-2
+- 661697 rebuild for fixing problems with vendorach/lib
+
 * Mon Sep 20 2010 Paul Howarth <paul@city-fan.org> - 0.08-1
 - Update to 0.08 (re-enable the caching of the stash)
 - Update patch for old ExtUtils::MakeMaker and Test::More versions

From c8cbe39a53f091baeb8585f5d2b6432b86f4c5b9 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Fri, 7 Jan 2011 12:00:37 +0000
Subject: [PATCH 08/10] Tidy up changelog entry

---
 perl-Package-Stash.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 8951974..3f8a4c7 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -75,7 +75,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Tue Dec 21 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.08-2
-- 661697 rebuild for fixing problems with vendorach/lib
+- Rebuild to fix problems with vendorarch/lib (#661697)
 
 * Mon Sep 20 2010 Paul Howarth <paul@city-fan.org> - 0.08-1
 - Update to 0.08 (re-enable the caching of the stash)

From a39aa3c820c3329db5d24dda7d43242385543412 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Fri, 7 Jan 2011 12:09:42 +0000
Subject: [PATCH 09/10] Update to 0.20

- New upstream release 0.20
  - Methods were renamed for brevity: s/_package//
  - Convert Package::Stash into a module which loads either the XS or pure perl
    implementation, depending on what's available
  - Use Test::Fatal instead of Test::Exception
  - Use Dist::CheckConflicts
  - Silence deprecation warnings for the method renaming for now
- New script and manpage: package-stash-conflicts
- New modules and manpages: Package::Stash::Conflicts and Package::Stash::PP
- New build requirements:
  - perl(Dist::CheckConflicts)
  - perl(Package::DeprecationManager)
  - perl(Package::Stash::XS)
  - perl(Test::LeakTrace)
  - perl(Test::Requires)
  - perl(Test::Script)
- Update patches for old ExtUtils::MakeMaker and Test::More versions
- Add new patch to work around absence of Test::Requires in EPEL-4
- Require perl(Package::Stash::XS) for performance and consistency
- Manually provide perl(Package::Stash::Conflicts), hidden from auto-provides
---
 .gitignore                                    |   2 +-
 Package-Stash-0.08-old-Test::More.patch       | 131 --------
 ...=> Package-Stash-0.20-EU::MM-version.patch |  30 +-
 Package-Stash-0.20-no-Test::Requires.patch    |  48 +++
 Package-Stash-0.20-old-Test::More.patch       | 294 ++++++++++++++++++
 perl-Package-Stash.spec                       |  58 +++-
 sources                                       |   2 +-
 7 files changed, 411 insertions(+), 154 deletions(-)
 delete mode 100644 Package-Stash-0.08-old-Test::More.patch
 rename Package-Stash-0.08-EU::MM-version.patch => Package-Stash-0.20-EU::MM-version.patch (54%)
 create mode 100644 Package-Stash-0.20-no-Test::Requires.patch
 create mode 100644 Package-Stash-0.20-old-Test::More.patch

diff --git a/.gitignore b/.gitignore
index a0f482b..f83268a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Package-Stash-0.08.tar.gz
+/Package-Stash-0.20.tar.gz
diff --git a/Package-Stash-0.08-old-Test::More.patch b/Package-Stash-0.08-old-Test::More.patch
deleted file mode 100644
index 36caacf..0000000
--- a/Package-Stash-0.08-old-Test::More.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-diff -up Package-Stash-0.08/t/01-basic.t.orig Package-Stash-0.08/t/01-basic.t
---- Package-Stash-0.08/t/01-basic.t.orig	2010-09-19 02:17:49.000000000 +0100
-+++ Package-Stash-0.08/t/01-basic.t	2010-09-20 11:37:09.187162663 +0100
-@@ -1,7 +1,7 @@
- use strict;
- use warnings;
- 
--use Test::More;
-+use Test::More tests => 110;
- use Test::Exception;
- 
- use Package::Stash;
-@@ -323,5 +323,3 @@
-         );
-     }
- }
--
--done_testing;
-diff -up Package-Stash-0.05/t/02-extension.t.orig Package-Stash-0.05/t/02-extension.t
---- Package-Stash-0.05/t/02-extension.t.orig	2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.05/t/02-extension.t	2010-06-07 09:53:18.571099744 +0100
-@@ -1,7 +1,7 @@
- use strict;
- use warnings;
- 
--use Test::More;
-+use Test::More tests => 15;
- use Test::Exception;
- 
- {
-@@ -66,5 +66,3 @@ lives_ok {
- } '... created %Foo::baz successfully';
- 
- ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
--
--done_testing;
-diff -up Package-Stash-0.05/t/03-io.t.orig Package-Stash-0.05/t/03-io.t
---- Package-Stash-0.05/t/03-io.t.orig	2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.05/t/03-io.t	2010-06-07 09:53:18.575099708 +0100
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 11;
- use Test::Exception;
- 
- {
-@@ -46,5 +46,3 @@ use Package::Stash;
-     ok($stash->has_package_symbol('baz'), "has baz");
-     is($stash->get_package_symbol('baz'), *Foo::foo{IO}, "got the right baz");
- }
--
--done_testing;
-diff -up Package-Stash-0.05/t/04-get.t.orig Package-Stash-0.05/t/04-get.t
---- Package-Stash-0.05/t/04-get.t.orig	2010-06-13 18:13:45.000000000 +0100
-+++ Package-Stash-0.05/t/04-get.t	2010-06-14 14:32:39.855811492 +0100
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 10;
- 
- use Package::Stash;
- 
-@@ -62,5 +62,3 @@
-     is_deeply($stash->get_or_add_package_symbol('@foo'), [1],
-             "got the right variable");
- }
--
--done_testing;
-diff -up Package-Stash-0.05/t/05-isa.t.orig Package-Stash-0.05/t/05-isa.t
---- Package-Stash-0.05/t/05-isa.t.orig	2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.05/t/05-isa.t	2010-06-07 09:55:14.591128547 +0100
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 1;
- 
- use Package::Stash;
- 
-@@ -16,6 +16,8 @@ use Package::Stash;
- my $stash = Package::Stash->new('Foo');
- my @ISA = ('Bar');
- @{$stash->get_package_symbol('@ISA')} = @ISA;
--isa_ok('Foo', 'Bar');
- 
--done_testing;
-+SKIP: {
-+skip "Test::More >= 0.88 needed for isa_ok() tests on classes", 1 if $Test::More::VERSION < 0.88;
-+isa_ok('Foo', 'Bar');
-+}
-diff -up Package-Stash-0.05/t/06-addsub.t.orig Package-Stash-0.05/t/06-addsub.t
---- Package-Stash-0.05/t/06-addsub.t.orig	2010-06-13 18:13:45.000000000 +0100
-+++ Package-Stash-0.05/t/06-addsub.t	2010-06-14 14:14:10.462975877 +0100
-@@ -1,7 +1,7 @@
- use strict;
- use warnings;
- 
--use Test::More;
-+use Test::More tests => 7;
- use Test::Exception;
- 
- BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
-@@ -41,5 +41,3 @@
- 
- 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.05/t/10-synopsis.t.orig Package-Stash-0.05/t/10-synopsis.t
---- Package-Stash-0.05/t/10-synopsis.t.orig	2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.05/t/10-synopsis.t	2010-06-07 09:53:18.596164680 +0100
-@@ -1,7 +1,7 @@
- #!/usr/bin/env perl
- use strict;
- use warnings;
--use Test::More;
-+use Test::More tests => 3;
- 
- use Package::Stash;
- 
-@@ -14,5 +14,3 @@ $stash->add_package_symbol('%foo', {bar 
- ok(!$stash->has_package_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 --git a/Package-Stash-0.08-EU::MM-version.patch b/Package-Stash-0.20-EU::MM-version.patch
similarity index 54%
rename from Package-Stash-0.08-EU::MM-version.patch
rename to Package-Stash-0.20-EU::MM-version.patch
index 1c5ece8..6968999 100644
--- a/Package-Stash-0.08-EU::MM-version.patch
+++ b/Package-Stash-0.20-EU::MM-version.patch
@@ -1,30 +1,30 @@
---- Package-Stash-0.08/Makefile.PL	2010-09-19 02:17:49.000000000 +0100
-+++ Package-Stash-0.08/Makefile.PL	2010-09-20 11:34:35.619285663 +0100
-@@ -4,7 +4,7 @@
- 
- 
- 
+--- Package-Stash-0.20/Makefile.PL.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/Makefile.PL	2011-01-04 13:33:09.585268028 +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 @@
-     'Test::More' => '0.88'
    },
    'CONFIGURE_REQUIRES' => {
+     'Dist::CheckConflicts' => '0.02',
 -    'ExtUtils::MakeMaker' => '6.31'
 +    'ExtUtils::MakeMaker' => '0'
    },
    'DISTNAME' => 'Package-Stash',
-   'EXE_FILES' => [],
-@@ -48,6 +48,9 @@
- delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
-   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+   'EXE_FILES' => [
+@@ -49,6 +49,9 @@
+   }
+ }
  
 +delete $WriteMakefileArgs{LICENSE}
 +  unless eval { ExtUtils::MakeMaker->VERSION(6.31) };
 +
- WriteMakefile(%WriteMakefileArgs);
- 
+ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+   unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
  
diff --git a/Package-Stash-0.20-no-Test::Requires.patch b/Package-Stash-0.20-no-Test::Requires.patch
new file mode 100644
index 0000000..4c02684
--- /dev/null
+++ b/Package-Stash-0.20-no-Test::Requires.patch
@@ -0,0 +1,48 @@
+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.20-old-Test::More.patch b/Package-Stash-0.20-old-Test::More.patch
new file mode 100644
index 0000000..14d9338
--- /dev/null
+++ b/Package-Stash-0.20-old-Test::More.patch
@@ -0,0 +1,294 @@
+diff -up Package-Stash-0.20/t/01-basic.t.orig Package-Stash-0.20/t/01-basic.t
+--- Package-Stash-0.20/t/01-basic.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/01-basic.t	2011-01-04 16:27:28.114396136 +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.20/t/02-extension.t.orig Package-Stash-0.20/t/02-extension.t
+--- Package-Stash-0.20/t/02-extension.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/02-extension.t	2011-01-04 16:27:28.145397010 +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.20/t/03-io.t.orig Package-Stash-0.20/t/03-io.t
+--- Package-Stash-0.20/t/03-io.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/03-io.t	2011-01-04 16:27:28.145397010 +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.20/t/04-get.t.orig Package-Stash-0.20/t/04-get.t
+--- Package-Stash-0.20/t/04-get.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/04-get.t	2011-01-04 16:27:28.146397038 +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.20/t/05-isa.t.orig Package-Stash-0.20/t/05-isa.t
+--- Package-Stash-0.20/t/05-isa.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/05-isa.t	2011-01-04 16:27:28.146397038 +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.20/t/06-addsub.t.orig Package-Stash-0.20/t/06-addsub.t
+--- Package-Stash-0.20/t/06-addsub.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/06-addsub.t	2011-01-04 16:27:28.147397066 +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.20/t/07-edge-cases.t.orig Package-Stash-0.20/t/07-edge-cases.t
+--- Package-Stash-0.20/t/07-edge-cases.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/07-edge-cases.t	2011-01-04 16:27:28.147397066 +0000
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 11;
+ 
+ use Package::Stash;
+ 
+@@ -51,5 +51,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-0.20/t/10-synopsis.t.orig Package-Stash-0.20/t/10-synopsis.t
+--- Package-Stash-0.20/t/10-synopsis.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/10-synopsis.t	2011-01-04 16:27:28.147397066 +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.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-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/20-leaks.t	2011-01-04 16:28:24.656990649 +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.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-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/21-leaks-debug.t	2011-01-04 16:30:26.617430549 +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.20/t/impl-selection/01-choice.t.orig Package-Stash-0.20/t/impl-selection/01-choice.t
+--- Package-Stash-0.20/t/impl-selection/01-choice.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/impl-selection/01-choice.t	2011-01-04 16:27:28.149397123 +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.20/t/impl-selection/02-env.t.orig Package-Stash-0.20/t/impl-selection/02-env.t
+--- Package-Stash-0.20/t/impl-selection/02-env.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/impl-selection/02-env.t	2011-01-04 16:27:28.149397123 +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.20/t/impl-selection/03-var.t.orig Package-Stash-0.20/t/impl-selection/03-var.t
+--- Package-Stash-0.20/t/impl-selection/03-var.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/impl-selection/03-var.t	2011-01-04 16:27:28.150397151 +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.20/t/impl-selection/10-basic-pp.t.orig Package-Stash-0.20/t/impl-selection/10-basic-pp.t
+--- Package-Stash-0.20/t/impl-selection/10-basic-pp.t.orig	2011-01-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/impl-selection/10-basic-pp.t	2011-01-04 16:27:28.150397151 +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.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-03 19:48:16.000000000 +0000
++++ Package-Stash-0.20/t/impl-selection/11-basic-xs.t	2011-01-04 16:27:28.151397179 +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/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 3f8a4c7..bf15073 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -5,30 +5,45 @@
 %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.08
-Release:	2%{?dist}
+Version:	0.20
+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.08-EU::MM-version.patch
-Patch1:		Package-Stash-0.08-old-Test::More.patch
+Patch0:		Package-Stash-0.20-EU::MM-version.patch
+Patch1:		Package-Stash-0.20-old-Test::More.patch
+Patch2:		Package-Stash-0.20-no-Test::Requires.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)
 BuildRequires:	perl(Test::EOL)
+BuildRequires:	perl(Test::Fatal)
 BuildRequires:	perl(Test::Exception)
 BuildRequires:	perl(Test::More)
 BuildRequires:	perl(Test::NoTabs)
 BuildRequires:	perl(Test::Pod)
 BuildRequires:	perl(Test::Pod::Coverage)
-# Pod::Coverage::TrustPod not yet in EPEL
-%if 0%{?fedora}
+# Pod::Coverage::TrustPod and Test::Requires not in EPEL-4
+%if "%{?rhel}" != "4"
 BuildRequires:	perl(Pod::Coverage::TrustPod)
+BuildRequires:	perl(Test::Requires)
+%endif
+# Test::LeakTrace and Test::Script not in EPEL-4 or EPEL-5
+%if "%{?rhel}" != "4" && "%{?rhel}" != "5"
+BuildRequires:	perl(Test::LeakTrace)
+BuildRequires:	perl(Test::Script)
 %endif
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# For performance and consistency
+Requires:	perl(Package::Stash::XS)
+# Not found by rpm auto-provides
+Provides:	perl(Package::Stash::Conflicts) = 0
 
 %{?perl_default_filter}
 
@@ -50,6 +65,11 @@ a simple API.
 %patch1 -p1
 %endif
 
+# Work around absence of Test::Requires in EPEL-4
+%if "%{?rhel}" == "4"
+%patch2 -p1
+%endif
+
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
@@ -70,10 +90,36 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
+%{_bindir}/package-stash-conflicts
 %{perl_vendorlib}/Package/
+%{_mandir}/man1/package-stash-conflicts.1*
 %{_mandir}/man3/Package::Stash.3pm*
+%{_mandir}/man3/Package::Stash::Conflicts.3pm*
+%{_mandir}/man3/Package::Stash::PP.3pm*
 
 %changelog
+* Tue Jan  4 2011 Paul Howarth <paul@city-fan.org> - 0.20-1
+- Update to 0.20
+  - Methods were renamed for brevity: s/_package//
+  - Convert Package::Stash into a module which loads either the XS or pure perl
+    implementation, depending on what's available
+  - Use Test::Fatal instead of Test::Exception
+  - Use Dist::CheckConflicts
+  - Silence deprecation warnings for the method renaming for now
+- New script and manpage: package-stash-conflicts
+- New modules and manpages: Package::Stash::Conflicts and Package::Stash::PP
+- New build requirements:
+  - perl(Dist::CheckConflicts)
+  - perl(Package::DeprecationManager)
+  - perl(Package::Stash::XS)
+  - perl(Test::LeakTrace)
+  - perl(Test::Requires)
+  - perl(Test::Script)
+- Update patches for old ExtUtils::MakeMaker and Test::More versions
+- Add new patch to work around absence of Test::Requires in EPEL-4
+- Require perl(Package::Stash::XS) for performance and consistency
+- Manually provide perl(Package::Stash::Conflicts), hidden from auto-provides
+
 * Tue Dec 21 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.08-2
 - Rebuild to fix problems with vendorarch/lib (#661697)
 
diff --git a/sources b/sources
index 03fc3ed..3c08492 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a34ef6de7c428a29f72e019db11624d  Package-Stash-0.08.tar.gz
+c8194c1a5f477308fdc64c1be359ccd7  Package-Stash-0.20.tar.gz

From ccbe95daea8e65f6cc454cc7a063cf27d508732b Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Fri, 7 Jan 2011 13:16:02 +0000
Subject: [PATCH 10/10] Update to 0.22

- New upstream release 0.22
  - Bump Package::Stash::XS version requirement since a bug was fixed there
- Update patches for old ExtUtils::MakeMaker and Test::More versions
- BR/R perl(Package::Stash::XS) >= 0.19
- Content-free manpages for package-stash-conflicts and
  Package::Stash::Conflicts dropped upstream
---
 .gitignore                                    |   2 +-
 ...=> Package-Stash-0.22-EU::MM-version.patch |   6 +-
 ...=> Package-Stash-0.22-old-Test::More.patch | 100 +++++++++---------
 perl-Package-Stash.spec                       |  20 ++--
 sources                                       |   2 +-
 5 files changed, 68 insertions(+), 62 deletions(-)
 rename Package-Stash-0.20-EU::MM-version.patch => Package-Stash-0.22-EU::MM-version.patch (78%)
 rename Package-Stash-0.20-old-Test::More.patch => Package-Stash-0.22-old-Test::More.patch (59%)

diff --git a/.gitignore b/.gitignore
index f83268a..3c7af49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/Package-Stash-0.20.tar.gz
+/Package-Stash-0.22.tar.gz
diff --git a/Package-Stash-0.20-EU::MM-version.patch b/Package-Stash-0.22-EU::MM-version.patch
similarity index 78%
rename from Package-Stash-0.20-EU::MM-version.patch
rename to Package-Stash-0.22-EU::MM-version.patch
index 6968999..6e47ad6 100644
--- a/Package-Stash-0.20-EU::MM-version.patch
+++ b/Package-Stash-0.22-EU::MM-version.patch
@@ -1,5 +1,5 @@
---- Package-Stash-0.20/Makefile.PL.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/Makefile.PL	2011-01-04 13:33:09.585268028 +0000
+--- 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;
@@ -12,7 +12,7 @@
 @@ -16,7 +16,7 @@
    },
    'CONFIGURE_REQUIRES' => {
-     'Dist::CheckConflicts' => '0.02',
+     'Dist::CheckConflicts' => '0.01',
 -    'ExtUtils::MakeMaker' => '6.31'
 +    'ExtUtils::MakeMaker' => '0'
    },
diff --git a/Package-Stash-0.20-old-Test::More.patch b/Package-Stash-0.22-old-Test::More.patch
similarity index 59%
rename from Package-Stash-0.20-old-Test::More.patch
rename to Package-Stash-0.22-old-Test::More.patch
index 14d9338..b9474e5 100644
--- a/Package-Stash-0.20-old-Test::More.patch
+++ b/Package-Stash-0.22-old-Test::More.patch
@@ -1,6 +1,6 @@
-diff -up Package-Stash-0.20/t/01-basic.t.orig Package-Stash-0.20/t/01-basic.t
---- Package-Stash-0.20/t/01-basic.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/01-basic.t	2011-01-04 16:27:28.114396136 +0000
+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;
@@ -16,9 +16,9 @@ diff -up Package-Stash-0.20/t/01-basic.t.orig Package-Stash-0.20/t/01-basic.t
  }
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/02-extension.t.orig Package-Stash-0.20/t/02-extension.t
---- Package-Stash-0.20/t/02-extension.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/02-extension.t	2011-01-04 16:27:28.145397010 +0000
+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;
@@ -34,9 +34,9 @@ diff -up Package-Stash-0.20/t/02-extension.t.orig Package-Stash-0.20/t/02-extens
  ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/03-io.t.orig Package-Stash-0.20/t/03-io.t
---- Package-Stash-0.20/t/03-io.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/03-io.t	2011-01-04 16:27:28.145397010 +0000
+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;
@@ -52,9 +52,9 @@ diff -up Package-Stash-0.20/t/03-io.t.orig Package-Stash-0.20/t/03-io.t
  }
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/04-get.t.orig Package-Stash-0.20/t/04-get.t
---- Package-Stash-0.20/t/04-get.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/04-get.t	2011-01-04 16:27:28.146397038 +0000
+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;
@@ -70,9 +70,9 @@ diff -up Package-Stash-0.20/t/04-get.t.orig Package-Stash-0.20/t/04-get.t
  }
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/05-isa.t.orig Package-Stash-0.20/t/05-isa.t
---- Package-Stash-0.20/t/05-isa.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/05-isa.t	2011-01-04 16:27:28.146397038 +0000
+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;
@@ -92,9 +92,9 @@ diff -up Package-Stash-0.20/t/05-isa.t.orig Package-Stash-0.20/t/05-isa.t
 -
 -done_testing;
 +}
-diff -up Package-Stash-0.20/t/06-addsub.t.orig Package-Stash-0.20/t/06-addsub.t
---- Package-Stash-0.20/t/06-addsub.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/06-addsub.t	2011-01-04 16:27:28.147397066 +0000
+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;
@@ -110,27 +110,27 @@ diff -up Package-Stash-0.20/t/06-addsub.t.orig Package-Stash-0.20/t/06-addsub.t
      '... got the right %DB::sub value for dunk with specified args';
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/07-edge-cases.t.orig Package-Stash-0.20/t/07-edge-cases.t
---- Package-Stash-0.20/t/07-edge-cases.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/07-edge-cases.t	2011-01-04 16:27:28.147397066 +0000
+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 => 11;
++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");
  
-@@ -51,5 +51,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");
+ use_ok('CompileTime');
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/10-synopsis.t.orig Package-Stash-0.20/t/10-synopsis.t
---- Package-Stash-0.20/t/10-synopsis.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/10-synopsis.t	2011-01-04 16:27:28.147397066 +0000
+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;
@@ -146,9 +146,9 @@ diff -up Package-Stash-0.20/t/10-synopsis.t.orig Package-Stash-0.20/t/10-synopsi
  is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
 -
 -done_testing;
-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-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/20-leaks.t	2011-01-04 16:28:24.656990649 +0000
+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;
@@ -174,9 +174,9 @@ diff -up Package-Stash-0.20/t/20-leaks.t.orig Package-Stash-0.20/t/20-leaks.t
  }
 -
 -done_testing;
-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-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/21-leaks-debug.t	2011-01-04 16:30:26.617430549 +0000
+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;
@@ -202,9 +202,9 @@ diff -up Package-Stash-0.20/t/21-leaks-debug.t.orig Package-Stash-0.20/t/21-leak
  }
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/impl-selection/01-choice.t.orig Package-Stash-0.20/t/impl-selection/01-choice.t
---- Package-Stash-0.20/t/impl-selection/01-choice.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/impl-selection/01-choice.t	2011-01-04 16:27:28.149397123 +0000
+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;
@@ -220,9 +220,9 @@ diff -up Package-Stash-0.20/t/impl-selection/01-choice.t.orig Package-Stash-0.20
  can_ok('Package::Stash', 'new');
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/impl-selection/02-env.t.orig Package-Stash-0.20/t/impl-selection/02-env.t
---- Package-Stash-0.20/t/impl-selection/02-env.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/impl-selection/02-env.t	2011-01-04 16:27:28.149397123 +0000
+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;
@@ -238,9 +238,9 @@ diff -up Package-Stash-0.20/t/impl-selection/02-env.t.orig Package-Stash-0.20/t/
  }
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/impl-selection/03-var.t.orig Package-Stash-0.20/t/impl-selection/03-var.t
---- Package-Stash-0.20/t/impl-selection/03-var.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/impl-selection/03-var.t	2011-01-04 16:27:28.150397151 +0000
+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;
@@ -256,9 +256,9 @@ diff -up Package-Stash-0.20/t/impl-selection/03-var.t.orig Package-Stash-0.20/t/
  }
 -
 -done_testing;
-diff -up Package-Stash-0.20/t/impl-selection/10-basic-pp.t.orig Package-Stash-0.20/t/impl-selection/10-basic-pp.t
---- Package-Stash-0.20/t/impl-selection/10-basic-pp.t.orig	2011-01-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/impl-selection/10-basic-pp.t	2011-01-04 16:27:28.150397151 +0000
+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;
@@ -274,9 +274,9 @@ diff -up Package-Stash-0.20/t/impl-selection/10-basic-pp.t.orig Package-Stash-0.
  }
 -
 -done_testing;
-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-03 19:48:16.000000000 +0000
-+++ Package-Stash-0.20/t/impl-selection/11-basic-xs.t	2011-01-04 16:27:28.151397179 +0000
+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;
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index bf15073..3769307 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -5,15 +5,15 @@
 %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.20
+Version:	0.22
 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.20-EU::MM-version.patch
-Patch1:		Package-Stash-0.20-old-Test::More.patch
+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
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -21,7 +21,7 @@ BuildRequires:	perl(Dist::CheckConflicts)
 BuildRequires:	perl(ExtUtils::MakeMaker)
 BuildRequires:	perl(Scalar::Util)
 BuildRequires:	perl(Package::DeprecationManager)
-BuildRequires:	perl(Package::Stash::XS)
+BuildRequires:	perl(Package::Stash::XS) >= 0.19
 BuildRequires:	perl(Test::EOL)
 BuildRequires:	perl(Test::Fatal)
 BuildRequires:	perl(Test::Exception)
@@ -41,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)
+Requires:	perl(Package::Stash::XS) >= 0.19
 # Not found by rpm auto-provides
 Provides:	perl(Package::Stash::Conflicts) = 0
 
@@ -92,12 +92,18 @@ rm -rf %{buildroot}
 %doc Changes LICENSE README
 %{_bindir}/package-stash-conflicts
 %{perl_vendorlib}/Package/
-%{_mandir}/man1/package-stash-conflicts.1*
 %{_mandir}/man3/Package::Stash.3pm*
-%{_mandir}/man3/Package::Stash::Conflicts.3pm*
 %{_mandir}/man3/Package::Stash::PP.3pm*
 
 %changelog
+* 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)
+- Update patches for old ExtUtils::MakeMaker and Test::More versions
+- BR/R perl(Package::Stash::XS) >= 0.19
+- Content-free manpages for package-stash-conflicts and
+  Package::Stash::Conflicts dropped upstream
+
 * Tue Jan  4 2011 Paul Howarth <paul@city-fan.org> - 0.20-1
 - Update to 0.20
   - Methods were renamed for brevity: s/_package//
diff --git a/sources b/sources
index 3c08492..4d65c89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8194c1a5f477308fdc64c1be359ccd7  Package-Stash-0.20.tar.gz
+8107a40643f492ce7598e0d50a0f6907  Package-Stash-0.22.tar.gz