commit 995a0b5d05f71c6a6a0b0d64721e148398f6570d
Author: Paul Howarth <p...@city-fan.org>
Date: Tue Jul 16 12:07:05 2013 +0100
Update to 0.27
- New upstream release 0.27
- Handle magic more correctly in add_symbol and get_or_add_symbol
- Add upstream patch to avoid build dependency on Package::Stash
- BR: perl(Variable::Magic) for the test suite
- Update patch for building with old Test::More versions
...h => Package-Stash-XS-0.27-old-Test::More.patch | 139 +++++++++++---------
Package-Stash-XS-0.27-test-XS.patch | 15 ++
perl-Package-Stash-XS.spec | 21 +++-
sources | 2 +-
4 files changed, 112 insertions(+), 65 deletions(-)
---
diff --git a/Package-Stash-XS-0.26-old-Test::More.patch
b/Package-Stash-XS-0.27-old-Test::More.patch
similarity index 59%
rename from Package-Stash-XS-0.26-old-Test::More.patch
rename to Package-Stash-XS-0.27-old-Test::More.patch
index 55f4219..39f1bd9 100644
--- a/Package-Stash-XS-0.26-old-Test::More.patch
+++ b/Package-Stash-XS-0.27-old-Test::More.patch
@@ -1,6 +1,6 @@
-diff -up Package-Stash-XS-0.26/t/addsub.t.orig Package-Stash-XS-0.26/t/addsub.t
---- Package-Stash-XS-0.26/t/addsub.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/addsub.t 2013-01-04 16:30:55.549017078 +0000
+diff -up ./t/addsub.t.orig ./t/addsub.t
+--- ./t/addsub.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/addsub.t 2013-07-16 09:28:05.247418080 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -16,27 +16,27 @@ diff -up Package-Stash-XS-0.26/t/addsub.t.orig
Package-Stash-XS-0.26/t/addsub.t
'... got the right %DB::sub value for dunk with specified args';
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/anon-basic.t.orig
Package-Stash-XS-0.26/t/anon-basic.t
---- Package-Stash-XS-0.26/t/anon-basic.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/anon-basic.t 2013-01-04 16:31:36.336943621
+0000
+diff -up ./t/anon-basic.t.orig ./t/anon-basic.t
+--- ./t/anon-basic.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/anon-basic.t 2013-07-16 09:28:05.247418080 +0100
@@ -399,5 +399,3 @@ $Quuux->{quuuux} = -1;
is_deeply([Package::Stash->new('Quuux')->list_all_symbols], [],
"Quuux:: isn't touched");
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/anon.t.orig Package-Stash-XS-0.26/t/anon.t
---- Package-Stash-XS-0.26/t/anon.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/anon.t 2013-01-04 16:31:15.335980418 +0000
+diff -up ./t/anon.t.orig ./t/anon.t
+--- ./t/anon.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/anon.t 2013-07-16 09:28:05.247418080 +0100
@@ -45,5 +45,3 @@ my $obj = $anon->bless({});
qr/Undefined subroutine \&__ANON__::baz called/
);
}
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/bare-anon-basic.t.orig
Package-Stash-XS-0.26/t/bare-anon-basic.t
---- Package-Stash-XS-0.26/t/bare-anon-basic.t.orig 2013-01-04
09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/t/bare-anon-basic.t 2013-01-04 16:30:55.562017052
+0000
+diff -up ./t/bare-anon-basic.t.orig ./t/bare-anon-basic.t
+--- ./t/bare-anon-basic.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/bare-anon-basic.t 2013-07-16 09:28:05.247418080 +0100
@@ -14,6 +14,8 @@ plan skip_all => "Anonymous stashes in P
plan skip_all => "This isn't really going to work yet, probably";
@@ -52,9 +52,9 @@ diff -up Package-Stash-XS-0.26/t/bare-anon-basic.t.orig
Package-Stash-XS-0.26/t/
"Quuux:: isn't touched");
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/bare-anon.t.orig
Package-Stash-XS-0.26/t/bare-anon.t
---- Package-Stash-XS-0.26/t/bare-anon.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/bare-anon.t 2013-01-04 16:30:55.562017052
+0000
+diff -up ./t/bare-anon.t.orig ./t/bare-anon.t
+--- ./t/bare-anon.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/bare-anon.t 2013-07-16 09:28:05.248418078 +0100
@@ -14,6 +14,8 @@ plan skip_all => "Anonymous stashes in P
plan skip_all => "This isn't really going to work yet, probably";
@@ -70,9 +70,9 @@ diff -up Package-Stash-XS-0.26/t/bare-anon.t.orig
Package-Stash-XS-0.26/t/bare-a
}
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/basic.t.orig Package-Stash-XS-0.26/t/basic.t
---- Package-Stash-XS-0.26/t/basic.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/basic.t 2013-01-04 16:30:55.562017052 +0000
+diff -up ./t/basic.t.orig ./t/basic.t
+--- ./t/basic.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/basic.t 2013-07-16 09:28:05.248418078 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -88,9 +88,9 @@ diff -up Package-Stash-XS-0.26/t/basic.t.orig
Package-Stash-XS-0.26/t/basic.t
);
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/compile-time.t.orig
Package-Stash-XS-0.26/t/compile-time.t
---- Package-Stash-XS-0.26/t/compile-time.t.orig 2013-01-04
09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/t/compile-time.t 2013-01-04 16:30:55.563017050
+0000
+diff -up ./t/compile-time.t.orig ./t/compile-time.t
+--- ./t/compile-time.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/compile-time.t 2013-07-16 09:28:05.248418078 +0100
@@ -2,8 +2,6 @@
use strict;
use warnings;
@@ -101,9 +101,9 @@ diff -up Package-Stash-XS-0.26/t/compile-time.t.orig
Package-Stash-XS-0.26/t/com
use_ok('CompileTime');
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/edge-cases.t.orig
Package-Stash-XS-0.26/t/edge-cases.t
---- Package-Stash-XS-0.26/t/edge-cases.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/edge-cases.t 2013-01-04 16:30:55.563017050
+0000
+diff -up ./t/edge-cases.t.orig ./t/edge-cases.t
+--- ./t/edge-cases.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/edge-cases.t 2013-07-16 09:28:05.249418076 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -119,9 +119,9 @@ diff -up Package-Stash-XS-0.26/t/edge-cases.t.orig
Package-Stash-XS-0.26/t/edge-
}
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/extension.t.orig
Package-Stash-XS-0.26/t/extension.t
---- Package-Stash-XS-0.26/t/extension.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/extension.t 2013-01-04 16:30:55.563017050
+0000
+diff -up ./t/extension.t.orig ./t/extension.t
+--- ./t/extension.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/extension.t 2013-07-16 09:28:05.249418076 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -137,9 +137,9 @@ diff -up Package-Stash-XS-0.26/t/extension.t.orig
Package-Stash-XS-0.26/t/extens
ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/get.t.orig Package-Stash-XS-0.26/t/get.t
---- Package-Stash-XS-0.26/t/get.t.orig 2013-01-04 09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/t/get.t 2013-01-04 16:30:55.564017048 +0000
+diff -up ./t/get.t.orig ./t/get.t
+--- ./t/get.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/get.t 2013-07-16 09:28:05.249418076 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -155,9 +155,9 @@ diff -up Package-Stash-XS-0.26/t/get.t.orig
Package-Stash-XS-0.26/t/get.t
}
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/io.t.orig Package-Stash-XS-0.26/t/io.t
---- Package-Stash-XS-0.26/t/io.t.orig 2013-01-04 09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/t/io.t 2013-01-04 16:30:55.564017048 +0000
+diff -up ./t/io.t.orig ./t/io.t
+--- ./t/io.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/io.t 2013-07-16 09:28:05.249418076 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -173,9 +173,9 @@ diff -up Package-Stash-XS-0.26/t/io.t.orig
Package-Stash-XS-0.26/t/io.t
}
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/isa.t.orig Package-Stash-XS-0.26/t/isa.t
---- Package-Stash-XS-0.26/t/isa.t.orig 2013-01-04 09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/t/isa.t 2013-01-04 16:30:55.564017048 +0000
+diff -up ./t/isa.t.orig ./t/isa.t
+--- ./t/isa.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/isa.t 2013-07-16 09:28:05.250418075 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -220,27 +220,27 @@ diff -up Package-Stash-XS-0.26/t/isa.t.orig
Package-Stash-XS-0.26/t/isa.t
}
-done_testing;
-diff -up Package-Stash-XS-0.26/t/magic.t.orig Package-Stash-XS-0.26/t/magic.t
---- Package-Stash-XS-0.26/t/magic.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/magic.t 2013-01-04 16:30:55.564017048 +0000
+diff -up ./t/magic.t.orig ./t/magic.t
+--- ./t/magic.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/magic.t 2013-07-16 09:28:05.250418075 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
use lib 't/lib';
-use Test::More;
-+use Test::More tests => 4;
++use Test::More tests => 14;
use Package::Stash;
-@@ -28,5 +28,3 @@ use Package::Stash;
- my @foo = qw(a b c);
- is(eval q["@foo"], 'a-b-c');
+@@ -76,5 +76,3 @@ SKIP: {
+ is($fetch, 1, "get_or_add_symbol fetches (populated slot)");
+ is($store, 0, "get_or_add_symbol stores (populated slot)");
}
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/paamayim_nekdotayim.t.orig
Package-Stash-XS-0.26/t/paamayim_nekdotayim.t
---- Package-Stash-XS-0.26/t/paamayim_nekdotayim.t.orig 2013-01-04
09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/t/paamayim_nekdotayim.t 2013-01-04
16:30:55.564017048 +0000
+diff -up ./t/paamayim_nekdotayim.t.orig ./t/paamayim_nekdotayim.t
+--- ./t/paamayim_nekdotayim.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/paamayim_nekdotayim.t 2013-07-16 09:28:05.250418075 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -256,9 +256,9 @@ diff -up Package-Stash-XS-0.26/t/paamayim_nekdotayim.t.orig
Package-Stash-XS-0.2
);
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/scalar-values.t.orig
Package-Stash-XS-0.26/t/scalar-values.t
---- Package-Stash-XS-0.26/t/scalar-values.t.orig 2013-01-04
09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/t/scalar-values.t 2013-01-04 16:30:55.565017046
+0000
+diff -up ./t/scalar-values.t.orig ./t/scalar-values.t
+--- ./t/scalar-values.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/scalar-values.t 2013-07-16 09:28:05.250418075 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -274,9 +274,9 @@ diff -up Package-Stash-XS-0.26/t/scalar-values.t.orig
Package-Stash-XS-0.26/t/sc
"can add vstring values");
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/stash-deletion.t.orig
Package-Stash-XS-0.26/t/stash-deletion.t
---- Package-Stash-XS-0.26/t/stash-deletion.t.orig 2013-01-04
09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/t/stash-deletion.t 2013-01-04 16:30:55.565017046
+0000
+diff -up ./t/stash-deletion.t.orig ./t/stash-deletion.t
+--- ./t/stash-deletion.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/stash-deletion.t 2013-07-16 09:28:05.250418075 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -292,9 +292,9 @@ diff -up Package-Stash-XS-0.26/t/stash-deletion.t.orig
Package-Stash-XS-0.26/t/s
}
-
-done_testing;
-diff -up Package-Stash-XS-0.26/t/synopsis.t.orig
Package-Stash-XS-0.26/t/synopsis.t
---- Package-Stash-XS-0.26/t/synopsis.t.orig 2013-01-04 09:36:41.000000000
+0000
-+++ Package-Stash-XS-0.26/t/synopsis.t 2013-01-04 16:30:55.565017046 +0000
+diff -up ./t/synopsis.t.orig ./t/synopsis.t
+--- ./t/synopsis.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./t/synopsis.t 2013-07-16 09:28:05.251418072 +0100
@@ -2,7 +2,7 @@
use strict;
use warnings;
@@ -310,9 +310,26 @@ diff -up Package-Stash-XS-0.26/t/synopsis.t.orig
Package-Stash-XS-0.26/t/synopsi
is_deeply(*{ $namespace->{foo} }{HASH}, {bar => 1}, "namespace works
properly");
-
-done_testing;
-diff -up Package-Stash-XS-0.26/xt/author/leaks-debug.t.orig
Package-Stash-XS-0.26/xt/author/leaks-debug.t
---- Package-Stash-XS-0.26/xt/author/leaks-debug.t.orig 2013-01-04
09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/xt/author/leaks-debug.t 2013-01-04
16:30:55.565017046 +0000
+diff -up ./t/warnings.t.orig ./t/warnings.t
+--- ./t/warnings.t.orig 2013-07-16 09:28:05.244418086 +0100
++++ ./t/warnings.t 2013-07-16 09:28:25.408377267 +0100
+@@ -2,7 +2,7 @@
+ use strict;
+ use warnings;
+ use lib 't/lib';
+-use Test::More;
++use Test::More tests => 1;
+
+ use Package::Stash;
+
+@@ -19,4 +19,3 @@ BEGIN {
+
+ is($warnings, '');
+
+-done_testing;
+diff -up ./xt/author/leaks-debug.t.orig ./xt/author/leaks-debug.t
+--- ./xt/author/leaks-debug.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./xt/author/leaks-debug.t 2013-07-16 09:28:05.251418072 +0100
@@ -11,6 +11,8 @@ BEGIN { $^P |= 0x210 } # PERLDBf_SUBLINE
use Package::Stash;
use Symbol;
@@ -339,9 +356,9 @@ diff -up Package-Stash-XS-0.26/xt/author/leaks-debug.t.orig
Package-Stash-XS-0.2
}
-
-done_testing;
-diff -up Package-Stash-XS-0.26/xt/author/leaks.t.orig
Package-Stash-XS-0.26/xt/author/leaks.t
---- Package-Stash-XS-0.26/xt/author/leaks.t.orig 2013-01-04
09:36:41.000000000 +0000
-+++ Package-Stash-XS-0.26/xt/author/leaks.t 2013-01-04 16:30:55.566017044
+0000
+diff -up ./xt/author/leaks.t.orig ./xt/author/leaks.t
+--- ./xt/author/leaks.t.orig 2013-07-15 20:57:19.000000000 +0100
++++ ./xt/author/leaks.t 2013-07-16 09:28:05.252418070 +0100
@@ -9,6 +9,8 @@ use Test::LeakTrace;
use Package::Stash;
use Symbol;
diff --git a/Package-Stash-XS-0.27-test-XS.patch
b/Package-Stash-XS-0.27-test-XS.patch
new file mode 100644
index 0000000..01e9974
--- /dev/null
+++ b/Package-Stash-XS-0.27-test-XS.patch
@@ -0,0 +1,15 @@
+https://github.com/doy/package-stash-xs/pull/1
+https://github.com/doy/package-stash-xs/commit/98a5781
+
+Make sure we're testing against ::XS
+
+--- t/warnings.t
++++ t/warnings.t
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env perl
+ use strict;
+ use warnings;
++use lib 't/lib';
+ use Test::More;
+
+ use Package::Stash;
diff --git a/perl-Package-Stash-XS.spec b/perl-Package-Stash-XS.spec
index 24344b7..a086607 100644
--- a/perl-Package-Stash-XS.spec
+++ b/perl-Package-Stash-XS.spec
@@ -1,12 +1,13 @@
Name: perl-Package-Stash-XS
-Version: 0.26
-Release: 2%{?dist}
+Version: 0.27
+Release: 1%{?dist}
Summary: Faster and more correct implementation of the Package::Stash API
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Package-Stash-XS/
Source0:
http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-%{version}.tar.gz
-Patch1: Package-Stash-XS-0.26-old-Test::More.patch
+Patch1: Package-Stash-XS-0.27-old-Test::More.patch
+Patch4: Package-Stash-XS-0.27-test-XS.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
BuildRequires: perl >= 3:5.8.1
BuildRequires: perl(base)
@@ -29,6 +30,10 @@ BuildRequires: perl(Test::NoTabs)
BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(Test::Requires)
+# No Variable::Magic in EPEL-5
+%if "%{?rhel}" != "5"
+BuildRequires: perl(Variable::Magic)
+%endif
BuildRequires: perl(XSLoader)
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
@@ -43,6 +48,9 @@ installed, and should be preferred in all environments with a
compiler.
%prep
%setup -q -n Package-Stash-XS-%{version}
+# Avoid need for base Package::Stash package (Github Pull #1)
+%patch4
+
# Patch test suite to work with old Test::More versions if necessary
%if "%{?rhel}" == "5"
%patch1 -p1
@@ -77,6 +85,13 @@ rm -rf %{buildroot}
%{_mandir}/man3/Package::Stash::XS.3pm*
%changelog
+* Tue Jul 16 2013 Paul Howarth <p...@city-fan.org> - 0.27-1
+- Update to 0.27
+ - Handle magic more correctly in add_symbol and get_or_add_symbol
+- Add upstream patch to avoid build dependency on Package::Stash
+- BR: perl(Variable::Magic) for the test suite
+- Update patch for building with old Test::More versions
+
* Thu Jan 24 2013 Paul Howarth <p...@city-fan.org> - 0.26-2
- BR: perl(Package::Anon) if we have Perl ≥ 5.14
diff --git a/sources b/sources
index ebc07a4..9a28e99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-33b07af6344d4a16ecd4e9ae3fa48984 Package-Stash-XS-0.26.tar.gz
+738b4afe0554b43368e743284803176c Package-Stash-XS-0.27.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
