commit ccbe95daea8e65f6cc454cc7a063cf27d508732b
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Fri Jan 7 13:16:02 2011 +0000
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 +-
...atch => Package-Stash-0.22-EU::MM-version.patch | 6 +-
...atch => Package-Stash-0.22-old-Test::More.patch | 100 ++++++++++----------
perl-Package-Stash.spec | 20 +++--
sources | 2 +-
5 files changed, 68 insertions(+), 62 deletions(-)
---
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@xxxxxxxxxxxx> - 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@xxxxxxxxxxxx> - 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
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
