From 5c52b18197bb9285f4da2722bede30adefa095a6 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: May 22 2017 09:50:51 +0000 Subject: Restore compatibility with Perl 5.26.0 --- diff --git a/Panotools-Script-0.28-Escape-literal-curly-bracket-in-a-regexp.patch b/Panotools-Script-0.28-Escape-literal-curly-bracket-in-a-regexp.patch new file mode 100644 index 0000000..4d49c36 --- /dev/null +++ b/Panotools-Script-0.28-Escape-literal-curly-bracket-in-a-regexp.patch @@ -0,0 +1,30 @@ +From 931c2cecad0e383052d6d5bb6612c49abd51ba76 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 22 May 2017 11:48:27 +0200 +Subject: [PATCH] Escape literal curly bracket in a regexp +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Literal curly brackets must be escaped for Perl 5.26.0. + +CPAN RT#117275 + +Signed-off-by: Petr Písař +--- + t/104.metachars.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/104.metachars.t b/t/104.metachars.t +index 68ec199..8f3bb9e 100644 +--- a/t/104.metachars.t ++++ b/t/104.metachars.t +@@ -25,4 +25,4 @@ print $rule->Assemble; + ok ($rule->Assemble =~ /%.1 : %.pod/); + ok ($rule->Assemble =~ /\tpod2man --center \$\(PACKAGE\) --release \$\(PACKAGE_VERSION\) \$< \$@/); + ok ($rule->Assemble =~ /\techo `uname -a` > \$\(TMPDIR\)\/foo/); +-ok ($rule->Assemble =~ /\tuname -a > \${TMPDIR}\/bar && echo \\"\\ \\#\\#\\#\\ \\\(woo\\!\\\)\\ \\#\\#\\#\\ \\"/); ++ok ($rule->Assemble =~ /\tuname -a > \$\{TMPDIR\}\/bar && echo \\"\\ \\#\\#\\#\\ \\\(woo\\!\\\)\\ \\#\\#\\#\\ \\"/); +-- +2.9.4 + diff --git a/perl-Panotools-Script.spec b/perl-Panotools-Script.spec index f418963..7240b08 100644 --- a/perl-Panotools-Script.spec +++ b/perl-Panotools-Script.spec @@ -1,11 +1,13 @@ Name: perl-Panotools-Script Version: 0.28 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Library for manipulating Hugin .pto files License: GPLv2+ Group: Development/Libraries URL: http://search.cpan.org/dist/Panotools-Script/ Source0: http://search.cpan.org/CPAN/authors/id/B/BP/BPOSTLE/Panotools-Script-%{version}.tar.gz +# Restore compatibility with Perl 5.26.0, CPAN RT#117275 +Patch0: Panotools-Script-0.28-Escape-literal-curly-bracket-in-a-regexp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl-generators @@ -31,6 +33,7 @@ stitching software. %prep %setup -q -n Panotools-Script-%{version} +%patch0 -p1 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -75,6 +78,9 @@ update-desktop-database &> /dev/null ||: %{_mandir}/man1/* %changelog +* Mon May 22 2017 Petr Pisar - 0.28-10 +- Restore compatibility with Perl 5.26.0 (CPAN RT#117275) + * Sat Feb 11 2017 Fedora Release Engineering - 0.28-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild