commit 0749ba9e5abc64ea06bfcb1a36ed57e9b231946b
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Fri Jul 30 12:59:01 2010 +0100
Update to 0.05
Update to current upstream release 0.05:
- Bump Test::More requirement for done_testing
- Update packaging stuff
BR: perl(Test::EOL) and perl(Test::NoTabs)
Update patch for old Test::More versions
Unify spec for all active branches
.gitignore | 2 +-
...atch => Package-Stash-0.05-old-Test::More.patch | 42 ++++++++++----------
perl-Package-Stash.spec | 31 +++++++++++++--
sources | 2 +-
4 files changed, 50 insertions(+), 27 deletions(-)
---
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.04-old-Test::More.patch b/Package-Stash-0.05-old-Test::More.patch
similarity index 60%
rename from Package-Stash-0.04-old-Test::More.patch
rename to Package-Stash-0.05-old-Test::More.patch
index 82ca874..ca53b80 100644
--- a/Package-Stash-0.04-old-Test::More.patch
+++ b/Package-Stash-0.05-old-Test::More.patch
@@ -1,6 +1,6 @@
-diff -up Package-Stash-0.03/t/001-basic.t.orig Package-Stash-0.03/t/001-basic.t
---- Package-Stash-0.03/t/001-basic.t.orig 2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.03/t/001-basic.t 2010-06-07 09:53:18.570100938 +0100
+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;
@@ -16,9 +16,9 @@ diff -up Package-Stash-0.03/t/001-basic.t.orig Package-Stash-0.03/t/001-basic.t
}
-
-done_testing;
-diff -up Package-Stash-0.03/t/002-extension.t.orig Package-Stash-0.03/t/002-extension.t
---- Package-Stash-0.03/t/002-extension.t.orig 2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.03/t/002-extension.t 2010-06-07 09:53:18.571099744 +0100
+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;
@@ -34,9 +34,9 @@ diff -up Package-Stash-0.03/t/002-extension.t.orig Package-Stash-0.03/t/002-exte
ok(!defined($Foo::{baz}), '... the %baz slot has still not been created');
-
-done_testing;
-diff -up Package-Stash-0.03/t/003-io.t.orig Package-Stash-0.03/t/003-io.t
---- Package-Stash-0.03/t/003-io.t.orig 2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.03/t/003-io.t 2010-06-07 09:53:18.575099708 +0100
+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;
@@ -52,9 +52,9 @@ diff -up Package-Stash-0.03/t/003-io.t.orig Package-Stash-0.03/t/003-io.t
}
-
-done_testing;
-diff -up Package-Stash-0.04/t/004-get.t.orig Package-Stash-0.04/t/004-get.t
---- Package-Stash-0.04/t/004-get.t.orig 2010-06-13 18:13:45.000000000 +0100
-+++ Package-Stash-0.04/t/004-get.t 2010-06-14 14:32:39.855811492 +0100
+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;
@@ -70,9 +70,9 @@ diff -up Package-Stash-0.04/t/004-get.t.orig Package-Stash-0.04/t/004-get.t
}
-
-done_testing;
-diff -up Package-Stash-0.03/t/005-isa.t.orig Package-Stash-0.03/t/005-isa.t
---- Package-Stash-0.03/t/005-isa.t.orig 2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.03/t/005-isa.t 2010-06-07 09:55:14.591128547 +0100
+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;
@@ -93,9 +93,9 @@ diff -up Package-Stash-0.03/t/005-isa.t.orig Package-Stash-0.03/t/005-isa.t
+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.04/t/006-addsub.t.orig Package-Stash-0.04/t/006-addsub.t
---- Package-Stash-0.04/t/006-addsub.t.orig 2010-06-13 18:13:45.000000000 +0100
-+++ Package-Stash-0.04/t/006-addsub.t 2010-06-14 14:14:10.462975877 +0100
+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;
@@ -111,9 +111,9 @@ diff -up Package-Stash-0.04/t/006-addsub.t.orig Package-Stash-0.04/t/006-addsub.
'... got the right %DB::sub value for dunk with specified args';
-
-done_testing;
-diff -up Package-Stash-0.03/t/010-synopsis.t.orig Package-Stash-0.03/t/010-synopsis.t
---- Package-Stash-0.03/t/010-synopsis.t.orig 2010-05-14 17:41:34.000000000 +0100
-+++ Package-Stash-0.03/t/010-synopsis.t 2010-06-07 09:53:18.596164680 +0100
+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;
diff --git a/perl-Package-Stash.spec b/perl-Package-Stash.spec
index 45eb87e..abe4876 100644
--- a/perl-Package-Stash.spec
+++ b/perl-Package-Stash.spec
@@ -1,5 +1,11 @@
+# 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
@@ -7,15 +13,21 @@ 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.04-old-Test::More.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(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}
@@ -29,10 +41,14 @@ a simple API.
%setup -q -n Package-Stash-%{version}
# Don't really need ExtUtils::MakeMaker >= 6.31
+%if %{old_eumm}
%patch0 -p1
+%endif
-# Compatibility with Test::More < 0.88
+# Compatibility with old Test::More versions
+%if %{old_test_more}
%patch1 -p1
+%endif
%build
perl Makefile.PL INSTALLDIRS=vendor
@@ -58,7 +74,14 @@ rm -rf %{buildroot}
%{_mandir}/man3/Package::Stash.3pm*
%changelog
-* Mon Jul 14 2010 Paul Howarth <paul@xxxxxxxxxxxx> - 0.04-1
+* Wed Jun 16 2010 Paul Howarth <paul@xxxxxxxxxxxx> - 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@xxxxxxxxxxxx> - 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
--
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
