[perl-Test-Dist-VersionSync] Adapt to Test-Simple-0.98_05
Petr Pisar
ppisar at fedoraproject.org
Wed Jul 24 07:28:14 UTC 2013
commit 937a51f8ebce39b5e1ea17b6a0a2895f36f24060
Author: Petr Písař <ppisar at redhat.com>
Date: Wed Jul 24 09:27:16 2013 +0200
Adapt to Test-Simple-0.98_05
...-Test-Simple-0.98_04-quotes-default-names.patch | 56 +++++++++++
...Test-Simple-0.98_05-outputs-subtest-names.patch | 105 ++++++++++++++++++++
perl-Test-Dist-VersionSync.spec | 9 ++
3 files changed, 170 insertions(+), 0 deletions(-)
---
diff --git a/Test-Dist-VersionSync-1.1.1-Test-Simple-0.98_04-quotes-default-names.patch b/Test-Dist-VersionSync-1.1.1-Test-Simple-0.98_04-quotes-default-names.patch
new file mode 100644
index 0000000..3ba80d1
--- /dev/null
+++ b/Test-Dist-VersionSync-1.1.1-Test-Simple-0.98_04-quotes-default-names.patch
@@ -0,0 +1,56 @@
+From f4778c06c4620d92e50b6635f284323138b7de7a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 24 Jul 2013 09:19:39 +0200
+Subject: [PATCH 2/2] Test-Simple-0.98_04 quotes default names
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+<https://github.com/guillaumeaubert/Test-Dist-VersionSync/issues/2>
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ t/22-ok_versions-modules_list.t | 5 ++++-
+ t/23-ok_versions-empty_list.t | 6 +++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/t/22-ok_versions-modules_list.t b/t/22-ok_versions-modules_list.t
+index a2c75d7..5361c94 100644
+--- a/t/22-ok_versions-modules_list.t
++++ b/t/22-ok_versions-modules_list.t
+@@ -27,7 +27,10 @@ ok(
+
+ test_out( '1..3')
+ if $Test::More::VERSION >= 1.005000005;
+-test_out( 'ok 1 - modules list isa ARRAY' );
++test_out( 'ok 1 - modules list isa ARRAY' )
++ if $Test::Simple::VERSION < 0.9804;
++test_out( q{ok 1 - 'modules list' isa 'ARRAY'} )
++ if $Test::Simple::VERSION >= 0.9804;
+ test_out( ' TAP version 13' )
+ if $Test::More::VERSION >= 1.005 && $Test::More::VERSION < 1.005000005;
+ test_out( ' # Subtest: Retrieve versions for all modules listed.' )
+diff --git a/t/23-ok_versions-empty_list.t b/t/23-ok_versions-empty_list.t
+index 6fe9e64..9623b8b 100644
+--- a/t/23-ok_versions-empty_list.t
++++ b/t/23-ok_versions-empty_list.t
+@@ -7,11 +7,15 @@ use Test::Builder::Tester;
+ use Test::Dist::VersionSync;
+ use Test::FailWarnings -allow_deps => 1;
+ use Test::More tests => 1;
++require Test::Simple;
+
+
+ test_out( '1..3')
+ if $Test::More::VERSION >= 1.005000005;
+-test_out( 'ok 1 - modules list isa ARRAY' );
++test_out( 'ok 1 - modules list isa ARRAY' )
++ if $Test::Simple::VERSION < 0.9804;
++test_out( q{ok 1 - 'modules list' isa 'ARRAY'} )
++ if $Test::Simple::VERSION >= 0.9804;
+ test_out( 'ok 2 # skip No module found in the distribution.' );
+ test_out( 'ok 3 # skip No module found in the distribution.' );
+
+--
+1.8.1.4
+
diff --git a/Test-Dist-VersionSync-1.1.1-Test-Simple-0.98_05-outputs-subtest-names.patch b/Test-Dist-VersionSync-1.1.1-Test-Simple-0.98_05-outputs-subtest-names.patch
new file mode 100644
index 0000000..b55a1d3
--- /dev/null
+++ b/Test-Dist-VersionSync-1.1.1-Test-Simple-0.98_05-outputs-subtest-names.patch
@@ -0,0 +1,105 @@
+From b47d8d0923ca739820a4dfa7bb618bedae630818 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Wed, 24 Jul 2013 09:06:44 +0200
+Subject: [PATCH 1/2] Test-Simple-0.98_05 outputs subtest names
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+<https://github.com/guillaumeaubert/Test-Dist-VersionSync/issues/1>
+
+Signed-off-by: Petr Písař <ppisar at redhat.com>
+---
+ t/20-ok_versions-sync.t | 3 +++
+ t/21-ok_versions-desync.t | 3 +++
+ t/22-ok_versions-modules_list.t | 3 +++
+ t/25-ok_versions-missing_version.t | 3 +++
+ 4 files changed, 12 insertions(+)
+
+diff --git a/t/20-ok_versions-sync.t b/t/20-ok_versions-sync.t
+index 6638410..5b9cff0 100644
+--- a/t/20-ok_versions-sync.t
++++ b/t/20-ok_versions-sync.t
+@@ -7,6 +7,7 @@ use Test::Builder::Tester;
+ use Test::Dist::VersionSync;
+ use Test::FailWarnings -allow_deps => 1;
+ use Test::More tests => 5;
++require Test::Simple;
+
+
+ use_ok( 'Cwd' );
+@@ -31,6 +32,8 @@ test_out( 'ok 2 - The MANIFEST file is present at the root of the distribution.'
+ test_out( 'ok 3 - Retrieve MANIFEST file.' );
+ test_out( ' TAP version 13' )
+ if $Test::More::VERSION >= 1.005 && $Test::More::VERSION < 1.005000005;
++test_out( ' # Subtest: Retrieve versions for all modules listed.' )
++ if $Test::Simple::VERSION >= 0.9805;
+ test_out( ' 1..4' );
+ test_out( ' ok 1 - use TestModule1;' );
+ test_out( ' ok 2 - Module TestModule1 declares a version.' );
+diff --git a/t/21-ok_versions-desync.t b/t/21-ok_versions-desync.t
+index 183e544..a078f35 100644
+--- a/t/21-ok_versions-desync.t
++++ b/t/21-ok_versions-desync.t
+@@ -7,6 +7,7 @@ use Test::Builder::Tester;
+ use Test::Dist::VersionSync;
+ use Test::FailWarnings -allow_deps => 1;
+ use Test::More tests => 5;
++require Test::Simple;
+
+
+ use_ok( 'Cwd' );
+@@ -31,6 +32,8 @@ test_out( 'ok 2 - The MANIFEST file is present at the root of the distribution.'
+ test_out( 'ok 3 - Retrieve MANIFEST file.' );
+ test_out( ' TAP version 13' )
+ if $Test::More::VERSION >= 1.005 && $Test::More::VERSION < 1.005000005;
++test_out( ' # Subtest: Retrieve versions for all modules listed.' )
++ if $Test::Simple::VERSION >= 0.9805;
+ test_out( ' 1..4' );
+ test_out( ' ok 1 - use TestModule1;' );
+ test_out( ' ok 2 - Module TestModule1 declares a version.' );
+diff --git a/t/22-ok_versions-modules_list.t b/t/22-ok_versions-modules_list.t
+index e71214a..a2c75d7 100644
+--- a/t/22-ok_versions-modules_list.t
++++ b/t/22-ok_versions-modules_list.t
+@@ -7,6 +7,7 @@ use Test::Builder::Tester;
+ use Test::Dist::VersionSync;
+ use Test::FailWarnings -allow_deps => 1;
+ use Test::More tests => 5;
++require Test::Simple;
+
+
+ use_ok( 'Cwd' );
+@@ -29,6 +30,8 @@ test_out( '1..3')
+ test_out( 'ok 1 - modules list isa ARRAY' );
+ test_out( ' TAP version 13' )
+ if $Test::More::VERSION >= 1.005 && $Test::More::VERSION < 1.005000005;
++test_out( ' # Subtest: Retrieve versions for all modules listed.' )
++ if $Test::Simple::VERSION >= 0.9805;
+ test_out( ' 1..4' );
+ test_out( ' ok 1 - use TestModule1;' );
+ test_out( ' ok 2 - Module TestModule1 declares a version.' );
+diff --git a/t/25-ok_versions-missing_version.t b/t/25-ok_versions-missing_version.t
+index 96a8907..a92bf4e 100644
+--- a/t/25-ok_versions-missing_version.t
++++ b/t/25-ok_versions-missing_version.t
+@@ -7,6 +7,7 @@ use Test::Builder::Tester;
+ use Test::Dist::VersionSync;
+ use Test::FailWarnings -allow_deps => 1;
+ use Test::More tests => 5;
++require Test::Simple;
+
+
+ use_ok( 'Cwd' );
+@@ -31,6 +32,8 @@ test_out( 'ok 2 - The MANIFEST file is present at the root of the distribution.'
+ test_out( 'ok 3 - Retrieve MANIFEST file.' );
+ test_out( ' TAP version 13' )
+ if $Test::More::VERSION >= 1.005 && $Test::More::VERSION < 1.005000005;
++test_out( ' # Subtest: Retrieve versions for all modules listed.' )
++ if $Test::Simple::VERSION >= 0.9805;
+ test_out( ' 1..4' );
+ test_out( ' ok 1 - use TestModule1;' );
+ test_out( ' ok 2 - Module TestModule1 declares a version.' );
+--
+1.8.1.4
+
diff --git a/perl-Test-Dist-VersionSync.spec b/perl-Test-Dist-VersionSync.spec
index a26ba1a..00be262 100644
--- a/perl-Test-Dist-VersionSync.spec
+++ b/perl-Test-Dist-VersionSync.spec
@@ -6,6 +6,12 @@ License: GPLv3
Group: Development/Libraries
URL: http://search.cpan.org/dist/Test-Dist-VersionSync/
Source0: http://www.cpan.org/authors/id/A/AU/AUBERTG/Test-Dist-VersionSync-%{version}.tar.gz
+# Adapt to Test-Simple-0.98_05,
+# https://github.com/guillaumeaubert/Test-Dist-VersionSync/issues/1
+Patch0: Test-Dist-VersionSync-1.1.1-Test-Simple-0.98_05-outputs-subtest-names.patch
+# Adapt to Test-Simple-0.98_04,
+# https://github.com/guillaumeaubert/Test-Dist-VersionSync/issues/2
+Patch1: Test-Dist-VersionSync-1.1.1-Test-Simple-0.98_04-quotes-default-names.patch
BuildArch: noarch
BuildRequires: perl
BuildRequires: perl(Carp)
@@ -23,6 +29,8 @@ the modules in a distribution have the same version number.
%prep
%setup -q -n Test-Dist-VersionSync-%{version}
+%patch0 -p1
+%patch1 -p1
%build
%{__perl} Build.PL installdirs=vendor
@@ -45,6 +53,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%changelog
* Tue Jul 23 2013 Petr Pisar <ppisar at redhat.com> - 1.1.1-2
- Perl 5.18 rebuild
+- Adapt to Test-Simple-0.98_05
* Sun May 12 2013 Emmanuel Seyman <emmanuel at seyman.fr> - 1.1.1-1
- Update to 1.1.1
More information about the scm-commits
mailing list