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
This commit is contained in:
Paul Howarth 2011-01-07 13:16:02 +00:00
parent a39aa3c820
commit ccbe95daea
5 changed files with 68 additions and 62 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/Package-Stash-0.20.tar.gz /Package-Stash-0.22.tar.gz

View File

@ -1,5 +1,5 @@
--- Package-Stash-0.20/Makefile.PL.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/Makefile.PL.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/Makefile.PL 2011-01-04 13:33:09.585268028 +0000 +++ Package-Stash-0.22/Makefile.PL 2011-01-06 09:40:45.977580477 +0000
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
BEGIN { require 5.8.3; } BEGIN { require 5.8.3; }
use strict; use strict;
@ -12,7 +12,7 @@
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
}, },
'CONFIGURE_REQUIRES' => { 'CONFIGURE_REQUIRES' => {
'Dist::CheckConflicts' => '0.02', 'Dist::CheckConflicts' => '0.01',
- 'ExtUtils::MakeMaker' => '6.31' - 'ExtUtils::MakeMaker' => '6.31'
+ 'ExtUtils::MakeMaker' => '0' + 'ExtUtils::MakeMaker' => '0'
}, },

View File

@ -1,6 +1,6 @@
diff -up Package-Stash-0.20/t/01-basic.t.orig Package-Stash-0.20/t/01-basic.t diff -up Package-Stash-0.22/t/01-basic.t.orig Package-Stash-0.22/t/01-basic.t
--- Package-Stash-0.20/t/01-basic.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/01-basic.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/01-basic.t 2011-01-04 16:27:28.114396136 +0000 +++ Package-Stash-0.22/t/01-basic.t 2011-01-06 09:42:32.847715002 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; 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; -done_testing;
diff -up Package-Stash-0.20/t/02-extension.t.orig Package-Stash-0.20/t/02-extension.t diff -up Package-Stash-0.22/t/02-extension.t.orig Package-Stash-0.22/t/02-extension.t
--- Package-Stash-0.20/t/02-extension.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/02-extension.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/02-extension.t 2011-01-04 16:27:28.145397010 +0000 +++ Package-Stash-0.22/t/02-extension.t 2011-01-06 09:42:32.868715618 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; 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'); ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
- -
-done_testing; -done_testing;
diff -up Package-Stash-0.20/t/03-io.t.orig Package-Stash-0.20/t/03-io.t diff -up Package-Stash-0.22/t/03-io.t.orig Package-Stash-0.22/t/03-io.t
--- Package-Stash-0.20/t/03-io.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/03-io.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/03-io.t 2011-01-04 16:27:28.145397010 +0000 +++ Package-Stash-0.22/t/03-io.t 2011-01-06 09:42:32.868715618 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; 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; -done_testing;
diff -up Package-Stash-0.20/t/04-get.t.orig Package-Stash-0.20/t/04-get.t diff -up Package-Stash-0.22/t/04-get.t.orig Package-Stash-0.22/t/04-get.t
--- Package-Stash-0.20/t/04-get.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/04-get.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/04-get.t 2011-01-04 16:27:28.146397038 +0000 +++ Package-Stash-0.22/t/04-get.t 2011-01-06 09:42:32.869715648 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; 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; -done_testing;
diff -up Package-Stash-0.20/t/05-isa.t.orig Package-Stash-0.20/t/05-isa.t diff -up Package-Stash-0.22/t/05-isa.t.orig Package-Stash-0.22/t/05-isa.t
--- Package-Stash-0.20/t/05-isa.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/05-isa.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/05-isa.t 2011-01-04 16:27:28.146397038 +0000 +++ Package-Stash-0.22/t/05-isa.t 2011-01-06 09:42:32.870715677 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; 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; -done_testing;
+} +}
diff -up Package-Stash-0.20/t/06-addsub.t.orig Package-Stash-0.20/t/06-addsub.t diff -up Package-Stash-0.22/t/06-addsub.t.orig Package-Stash-0.22/t/06-addsub.t
--- Package-Stash-0.20/t/06-addsub.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/06-addsub.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/06-addsub.t 2011-01-04 16:27:28.147397066 +0000 +++ Package-Stash-0.22/t/06-addsub.t 2011-01-06 09:42:32.870715677 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; 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'; '... got the right %DB::sub value for dunk with specified args';
- -
-done_testing; -done_testing;
diff -up Package-Stash-0.20/t/07-edge-cases.t.orig Package-Stash-0.20/t/07-edge-cases.t diff -up Package-Stash-0.22/t/07-edge-cases.t.orig Package-Stash-0.22/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.22/t/07-edge-cases.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/07-edge-cases.t 2011-01-04 16:27:28.147397066 +0000 +++ Package-Stash-0.22/t/07-edge-cases.t 2011-01-06 09:43:05.438672195 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; use warnings;
use lib 't/lib'; use lib 't/lib';
-use Test::More; -use Test::More;
+use Test::More tests => 11; +use Test::More tests => 14;
use Test::Fatal;
use Package::Stash; 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 use_ok('CompileTime');
# 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; -done_testing;
diff -up Package-Stash-0.20/t/10-synopsis.t.orig Package-Stash-0.20/t/10-synopsis.t diff -up Package-Stash-0.22/t/10-synopsis.t.orig Package-Stash-0.22/t/10-synopsis.t
--- Package-Stash-0.20/t/10-synopsis.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/10-synopsis.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/10-synopsis.t 2011-01-04 16:27:28.147397066 +0000 +++ Package-Stash-0.22/t/10-synopsis.t 2011-01-06 09:42:32.871715706 +0000
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
use strict; use strict;
use warnings; 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"); is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works properly");
- -
-done_testing; -done_testing;
diff -up Package-Stash-0.20/t/20-leaks.t.orig Package-Stash-0.20/t/20-leaks.t diff -up Package-Stash-0.22/t/20-leaks.t.orig Package-Stash-0.22/t/20-leaks.t
--- Package-Stash-0.20/t/20-leaks.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/20-leaks.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/20-leaks.t 2011-01-04 16:28:24.656990649 +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'; @@ -5,6 +5,7 @@ use lib 't/lib';
use Test::More; use Test::More;
use Test::Fatal; 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; -done_testing;
diff -up Package-Stash-0.20/t/21-leaks-debug.t.orig Package-Stash-0.20/t/21-leaks-debug.t diff -up Package-Stash-0.22/t/21-leaks-debug.t.orig Package-Stash-0.22/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.22/t/21-leaks-debug.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/21-leaks-debug.t 2011-01-04 16:30:26.617430549 +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'; @@ -5,6 +5,7 @@ use lib 't/lib';
use Test::More; use Test::More;
use Test::Fatal; 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; -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 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.20/t/impl-selection/01-choice.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/impl-selection/01-choice.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/impl-selection/01-choice.t 2011-01-04 16:27:28.149397123 +0000 +++ Package-Stash-0.22/t/impl-selection/01-choice.t 2011-01-06 09:42:32.873715766 +0000
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; 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'); can_ok('Package::Stash', 'new');
- -
-done_testing; -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 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.20/t/impl-selection/02-env.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/impl-selection/02-env.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/impl-selection/02-env.t 2011-01-04 16:27:28.149397123 +0000 +++ Package-Stash-0.22/t/impl-selection/02-env.t 2011-01-06 09:42:32.874715795 +0000
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; 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; -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 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.20/t/impl-selection/03-var.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/impl-selection/03-var.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/impl-selection/03-var.t 2011-01-04 16:27:28.150397151 +0000 +++ Package-Stash-0.22/t/impl-selection/03-var.t 2011-01-06 09:42:32.874715795 +0000
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; 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; -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 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.20/t/impl-selection/10-basic-pp.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/impl-selection/10-basic-pp.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/impl-selection/10-basic-pp.t 2011-01-04 16:27:28.150397151 +0000 +++ Package-Stash-0.22/t/impl-selection/10-basic-pp.t 2011-01-06 09:42:32.875715824 +0000
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; 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; -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 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.20/t/impl-selection/11-basic-xs.t.orig 2011-01-03 19:48:16.000000000 +0000 --- Package-Stash-0.22/t/impl-selection/11-basic-xs.t.orig 2011-01-06 05:16:45.000000000 +0000
+++ Package-Stash-0.20/t/impl-selection/11-basic-xs.t 2011-01-04 16:27:28.151397179 +0000 +++ Package-Stash-0.22/t/impl-selection/11-basic-xs.t 2011-01-06 09:42:32.875715824 +0000
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/usr/bin/env perl #!/usr/bin/env perl
use strict; use strict;

View File

@ -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) %global old_eumm %(perl -MExtUtils::MakeMaker -e 'printf "%d\\n", $ExtUtils::MakeMaker::VERSION < 6.31 ? 1 : 0;' 2>/dev/null || echo 0)
Name: perl-Package-Stash Name: perl-Package-Stash
Version: 0.20 Version: 0.22
Release: 1%{?dist} Release: 1%{?dist}
Summary: Routines for manipulating stashes Summary: Routines for manipulating stashes
Group: Development/Libraries Group: Development/Libraries
License: GPL+ or Artistic License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Package-Stash/ URL: http://search.cpan.org/dist/Package-Stash/
Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-%{version}.tar.gz Source0: http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-%{version}.tar.gz
Patch0: Package-Stash-0.20-EU::MM-version.patch Patch0: Package-Stash-0.22-EU::MM-version.patch
Patch1: Package-Stash-0.20-old-Test::More.patch Patch1: Package-Stash-0.22-old-Test::More.patch
Patch2: Package-Stash-0.20-no-Test::Requires.patch Patch2: Package-Stash-0.20-no-Test::Requires.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
@ -21,7 +21,7 @@ BuildRequires: perl(Dist::CheckConflicts)
BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(Scalar::Util) BuildRequires: perl(Scalar::Util)
BuildRequires: perl(Package::DeprecationManager) BuildRequires: perl(Package::DeprecationManager)
BuildRequires: perl(Package::Stash::XS) BuildRequires: perl(Package::Stash::XS) >= 0.19
BuildRequires: perl(Test::EOL) BuildRequires: perl(Test::EOL)
BuildRequires: perl(Test::Fatal) BuildRequires: perl(Test::Fatal)
BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Exception)
@ -41,7 +41,7 @@ BuildRequires: perl(Test::Script)
%endif %endif
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# For performance and consistency # For performance and consistency
Requires: perl(Package::Stash::XS) Requires: perl(Package::Stash::XS) >= 0.19
# Not found by rpm auto-provides # Not found by rpm auto-provides
Provides: perl(Package::Stash::Conflicts) = 0 Provides: perl(Package::Stash::Conflicts) = 0
@ -92,12 +92,18 @@ rm -rf %{buildroot}
%doc Changes LICENSE README %doc Changes LICENSE README
%{_bindir}/package-stash-conflicts %{_bindir}/package-stash-conflicts
%{perl_vendorlib}/Package/ %{perl_vendorlib}/Package/
%{_mandir}/man1/package-stash-conflicts.1*
%{_mandir}/man3/Package::Stash.3pm* %{_mandir}/man3/Package::Stash.3pm*
%{_mandir}/man3/Package::Stash::Conflicts.3pm*
%{_mandir}/man3/Package::Stash::PP.3pm* %{_mandir}/man3/Package::Stash::PP.3pm*
%changelog %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 * Tue Jan 4 2011 Paul Howarth <paul@city-fan.org> - 0.20-1
- Update to 0.20 - Update to 0.20
- Methods were renamed for brevity: s/_package// - Methods were renamed for brevity: s/_package//

View File

@ -1 +1 @@
c8194c1a5f477308fdc64c1be359ccd7 Package-Stash-0.20.tar.gz 8107a40643f492ce7598e0d50a0f6907 Package-Stash-0.22.tar.gz