From c52e76cba8c04daabe392ef55426cdea5b3b9bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
Date: Thu, 16 Jun 2016 08:51:06 +0200
Subject: Adapt tests to Test2-Workflow-0.000009

---
 ...2-Bundle-Spec-to-Test2-Bundle-SpecDeclare.patch | 89 ++++++++++++++++++++++
 perl-Trace-Mask.spec                               | 11 ++-
 2 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 
Trace-Mask-0.000007-Rename-Test2-Bundle-Spec-to-Test2-Bundle-SpecDeclare.patch

diff --git 
a/Trace-Mask-0.000007-Rename-Test2-Bundle-Spec-to-Test2-Bundle-SpecDeclare.patch
 
b/Trace-Mask-0.000007-Rename-Test2-Bundle-Spec-to-Test2-Bundle-SpecDeclare.patch
new file mode 100644
index 0000000..5b98983
--- /dev/null
+++ 
b/Trace-Mask-0.000007-Rename-Test2-Bundle-Spec-to-Test2-Bundle-SpecDeclare.patch
@@ -0,0 +1,89 @@
+From 5cf6e3832f2f2623ea9bd8e5945e078e21c9608e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com>
+Date: Thu, 16 Jun 2016 08:44:11 +0200
+Subject: [PATCH] Rename Test2::Bundle::Spec to Test2::Bundle::SpecDeclare
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Test2::Bundle::Spec module was moved to Test2-Plugin-SpecDeclare
+distribution under Test2::Bundle::SpecDeclare name.
+
+https://github.com/exodist/Trace-Mask/issues/4
+Signed-off-by: Petr Písař <ppi...@redhat.com>
+---
+ Makefile.PL | 1 +
+ t/Mask.t    | 2 +-
+ t/Test.t    | 2 +-
+ t/TryTiny.t | 2 +-
+ t/Util.t    | 2 +-
+ t/special.t | 2 +-
+ 6 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index b166ac3..58a7f1f 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -25,6 +25,7 @@ my %WriteMakefileArgs = (
+   },
+   "TEST_REQUIRES" => {
+     "Test2" => "0.000025",
++    "Test2::Bundle::SpecDeclare" => "0",
+     "Test2::Suite" => "0.000020",
+     "Test2::Workflow" => "0.000005"
+   },
+diff --git a/t/Mask.t b/t/Mask.t
+index 5f0b7c5..ff12c58 100644
+--- a/t/Mask.t
++++ b/t/Mask.t
+@@ -1,4 +1,4 @@
+-use Test2::Bundle::Spec -target => 'Trace::Mask';
++use Test2::Bundle::SpecDeclare -target => 'Trace::Mask';
+ 
+ ref_is($CLASS->masks, \%Trace::Mask::MASKS, "Got the reference");
+ 
+diff --git a/t/Test.t b/t/Test.t
+index 5174219..1b0b931 100644
+--- a/t/Test.t
++++ b/t/Test.t
+@@ -1,4 +1,4 @@
+-use Test2::Bundle::Spec;
++use Test2::Bundle::SpecDeclare;
+ 
+ use Trace::Mask::Test;
+ use Trace::Mask::Reference qw/trace/;
+diff --git a/t/TryTiny.t b/t/TryTiny.t
+index 4d9a038..0c96ae1 100644
+--- a/t/TryTiny.t
++++ b/t/TryTiny.t
+@@ -1,6 +1,6 @@
+ use Test2::Require::Module Carp => '1.03';
+ use Test2::Require::Module 'Try::Tiny' => '0.03';
+-use Test2::Bundle::Spec;
++use Test2::Bundle::SpecDeclare;
+ 
+ use Trace::Mask::TryTiny;
+ use Trace::Mask::Carp qw/longmess/;
+diff --git a/t/Util.t b/t/Util.t
+index 3b4ad0f..b3466b2 100644
+--- a/t/Util.t
++++ b/t/Util.t
+@@ -1,4 +1,4 @@
+-use Test2::Bundle::Spec -target => 'Trace::Mask::Util';
++use Test2::Bundle::SpecDeclare -target => 'Trace::Mask::Util';
+ use Trace::Mask;
+ 
+ use Trace::Mask::Util qw{
+diff --git a/t/special.t b/t/special.t
+index 9e6f849..c285931 100644
+--- a/t/special.t
++++ b/t/special.t
+@@ -1,4 +1,4 @@
+-use Test2::Bundle::Spec;
++use Test2::Bundle::SpecDeclare;
+ use Trace::Mask::Reference qw/trace trace_string/;
+ use Trace::Mask::Util qw/update_mask/;
+ use Data::Dumper;
+-- 
+2.5.5
+
diff --git a/perl-Trace-Mask.spec b/perl-Trace-Mask.spec
index effaecd..8c95308 100644
--- a/perl-Trace-Mask.spec
+++ b/perl-Trace-Mask.spec
@@ -1,6 +1,6 @@
 Name:           perl-Trace-Mask
 Version:        0.000007
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Masking frames in stack traces
 # License URLs in PODs are wrong
 # <https://github.com/exodist/Trace-Mask/issues/2>.
@@ -8,6 +8,9 @@ License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Trace-Mask/
 Source0:        
http://www.cpan.org/authors/id/E/EX/EXODIST/Trace-Mask-%{version}.tar.gz
+# Adapt tests to Test2-Workflow-0.000009,
+# <https://github.com/exodist/Trace-Mask/issues/4>
+Patch0:         
Trace-Mask-0.000007-Rename-Test2-Bundle-Spec-to-Test2-Bundle-SpecDeclare.patch
 BuildArch:      noarch
 BuildRequires:  coreutils
 BuildRequires:  findutils
@@ -34,7 +37,7 @@ BuildRequires:  perl(Test2::Tools::Subtest)
 BuildRequires:  perl(Try::Tiny) >= 0.03
 # Tests:
 BuildRequires:  perl(Test2::Bundle::Extended)
-BuildRequires:  perl(Test2::Bundle::Spec)
+BuildRequires:  perl(Test2::Bundle::SpecDeclare)
 BuildRequires:  perl(Test2::Require::Module)
 BuildRequires:  perl(Test2::Tools::Spec)
 # Test2::Workflow is the only versioned module in the perl-Test2-Workflow
@@ -73,6 +76,7 @@ that a tracer complies with the Trace::Mask specifications.
 
 %prep
 %setup -q -n Trace-Mask-%{version}
+%patch0 -p1
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor
@@ -100,6 +104,9 @@ make test
 %{_mandir}/man3/Trace::Mask::Test.*
 
 %changelog
+* Thu Jun 16 2016 Petr Pisar <ppi...@redhat.com> - 0.000007-3
+- Adapt tests to Test2-Workflow-0.000009
+
 * Sun May 15 2016 Jitka Plesnikova <jples...@redhat.com> - 0.000007-2
 - Perl 5.24 rebuild
 
-- 
cgit v0.12


        
http://pkgs.fedoraproject.org/cgit/perl-Trace-Mask.git/commit/?h=master&id=c52e76cba8c04daabe392ef55426cdea5b3b9bbf
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@lists.fedoraproject.org
https://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org

Reply via email to