Old TestML API moved to TestML1 name space

Template-Toolkit-Simple-0.31-Old-TestML-API-moved-to-TestML1-name-space.patch

@@ -0,0 +1,124 @@
+From cc179c23e92e315db4ffcd46d822a62fda3ca46a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 19 Nov 2018 09:21:46 +0100
+Subject: [PATCH] Old TestML API moved to TestML1 name space
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+<https://github.com/testml-lang/testml/wiki/TestML-and-CPAN>
+<https://bugzilla.redhat.com/show_bug.cgi?id=1650156>
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ t/cli.t         | 8 ++++----
+ t/render_json.t | 8 ++++----
+ t/render_xml.t  | 8 ++++----
+ t/render_yaml.t | 8 ++++----
+ 4 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/t/cli.t b/t/cli.t
+index b8f1ba2..3365acf 100644
+--- a/t/cli.t
++++ b/t/cli.t
+@@ -1,16 +1,16 @@
+ use lib 'inc';
+ 
+-use TestML;
++use TestML1;
+ 
+-TestML->new(
++TestML1->new(
+     testml => do { local $/; <DATA> },
+     bridge => 'main',
+ )->run;
+ 
+ {
+     package main;
+-    use base 'TestML::Bridge';
+-    use TestML::Util;
++    use base 'TestML1::Bridge';
++    use TestML1::Util;
+ 
+     sub run_command {
+         my ($self, $command) = @_;
+diff --git a/t/render_json.t b/t/render_json.t
+index 6d7d2c3..47a0ee3 100644
+--- a/t/render_json.t
++++ b/t/render_json.t
+@@ -6,17 +6,17 @@ use lib 'inc';
+         plan skip_all => 'JSON::XS required';
+ }
+ 
+-use TestML;
++use TestML1;
+ 
+-TestML->new(
++TestML1->new(
+     testml => do { local $/; <DATA> },
+     bridge => 'main',
+ )->run;
+ 
+ {
+     package main;
+-    use base 'TestML::Bridge';
+-    use TestML::Util;
++    use base 'TestML1::Bridge';
++    use TestML1::Util;
+     use Template::Toolkit::Simple;
+ 
+     sub render_template {
+diff --git a/t/render_xml.t b/t/render_xml.t
+index e656a29..5c7d0bc 100644
+--- a/t/render_xml.t
++++ b/t/render_xml.t
+@@ -6,17 +6,17 @@ use lib 'inc';
+         plan skip_all => 'XML::Simple required';
+ }
+ 
+-use TestML;
++use TestML1;
+ 
+-TestML->new(
++TestML1->new(
+     testml => do { local $/; <DATA> },
+     bridge => 'main',
+ )->run;
+ 
+ {
+     package main;
+-    use base 'TestML::Bridge';
+-    use TestML::Util;
++    use base 'TestML1::Bridge';
++    use TestML1::Util;
+     use Template::Toolkit::Simple;
+ 
+     sub render_template {
+diff --git a/t/render_yaml.t b/t/render_yaml.t
+index eb4effe..bd2af71 100644
+--- a/t/render_yaml.t
++++ b/t/render_yaml.t
+@@ -1,16 +1,16 @@
+ use lib 'inc';
+ 
+-use TestML;
++use TestML1;
+ 
+-TestML->new(
++TestML1->new(
+     testml => do { local $/; <DATA> },
+     bridge => 'main',
+ )->run;
+ 
+ {
+     package main;
+-    use base 'TestML::Bridge';
+-    use TestML::Util;
++    use base 'TestML1::Bridge';
++    use TestML1::Util;
+     use Template::Toolkit::Simple;
+ 
+     sub render_template {
+-- 
+2.17.2
+

perl-Template-Toolkit-Simple.spec

@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit-Simple
 Version:        0.31
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Simple interface to Template Toolkit
 # inc/Text/Diff.pm (not in binary package):     GPLv2+ or Artistic
 # rest:     GPL+ or Artistic
@@ -8,6 +8,8 @@ License:        GPL+ or Artistic
 Group:          Development/Libraries
 URL:            https://metacpan.org/release/Template-Toolkit-Simple
 Source0:        https://cpan.metacpan.org/authors/id/I/IN/INGY/Template-Toolkit-Simple-%{version}.tar.gz
+# Old TestML API moved to TestML1 name space, bug #1650156
+Patch0:         Template-Toolkit-Simple-0.31-Old-TestML-API-moved-to-TestML1-name-space.patch
 BuildArch:      noarch
 BuildRequires:  perl-interpreter
 BuildRequires:  perl-generators
@@ -29,12 +31,12 @@ BuildRequires:  perl(YAML::XS) >= 0.37
 BuildRequires:  perl(File::Find)
 BuildRequires:  perl(Test::More)
 %if !%{defined perl_bootstrap}
-# Break dependency cycle: perl-Template-Toolkit-Simple → perl-TestML
+# Break dependency cycle: perl-Template-Toolkit-Simple → perl-TestML1
 # → perl-Template-Toolkit-Simple
 BuildRequires:  perl(lib)
-BuildRequires:  perl(TestML)
-BuildRequires:  perl(TestML::Bridge)
-BuildRequires:  perl(TestML::Util)
+BuildRequires:  perl(TestML1)
+BuildRequires:  perl(TestML1::Bridge)
+BuildRequires:  perl(TestML1::Util)
 %endif
 Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Carp)
@@ -60,6 +62,7 @@ version.
 
 %prep
 %setup -q -n Template-Toolkit-Simple-%{version}
+%patch0 -p1
 # Remove bundled modules
 rm -r ./inc
 sed -i -e '/^inc\//d' MANIFEST
@@ -77,10 +80,10 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
 
 %check
 %if %{defined perl_bootstrap}
-# Break dependency cycle: perl-Template-Toolkit-Simple → perl-TestML
+# Break dependency cycle: perl-Template-Toolkit-Simple → perl-TestML1
 # → perl-Template-Toolkit-Simple
 make test TEST_FILES="$(find t -name '*.t' \
-    \! -exec grep -q -e 'use TestML' {} \; -print | tr \"\\n\" ' ')"
+    \! -exec grep -q -e 'use TestML1' {} \; -print | tr \"\\n\" ' ')"
 %else
 make test
 %endif
@@ -92,6 +95,9 @@ make test
 %{_bindir}/tt-render
 
 %changelog
+* Mon Nov 19 2018 Petr Pisar <ppisar@redhat.com> - 0.31-16
+- Old TestML API moved to TestML1 name space (bug #1650156)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.31-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild