- regex fix from Debian

diff --git a/regex-fix.patch b/regex-fix.patch
new file mode 100644 (file)
index 0000000..ac56456
--- /dev/null
+++ b/regex-fix.patch
@@ -0,0 +1,32 @@
+From 1f27900352e04ff4f19bec1c1e9635adad2be31c Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni@debian.org>
+Date: Fri, 18 May 2018 10:40:00 +0100
+Subject: [PATCH] Fix unescaped left braces in regexps, deprecated since Perl
+ 5.27.8
+
+This fixes test failures on recent Perl versions.
+---
+ tp/Texinfo/Parser.pm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
+index dc32ca2..c577aa9 100644
+--- a/tp/Texinfo/Parser.pm
++++ b/tp/Texinfo/Parser.pm
+@@ -5478,11 +5478,11 @@ sub _parse_special_misc_command($$$$)
+     }
+   } elsif ($command eq 'clickstyle') {
+     # REMACRO
+-    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*/) {
++    if ($line =~ /^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*/) {
+       $args = ['@'.$1];
+       $self->{'clickstyle'} = $1;
+       $remaining = $line;
+-      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)({})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
++      $remaining =~ s/^\s+@([[:alnum:]][[:alnum:]\-]*)(\{\})?\s*(\@(c|comment)((\@|\s+).*)?)?//;
+       $has_comment = 1 if (defined($4));
+     } else {
+       $self->line_error (sprintf($self->__(
+-- 
+2.17.0
+

diff --git a/texinfo.spec b/texinfo.spec
index 2fac62b05167908128716d7a4483e54d283947bf..e7cfbe15b22ff8483ed3826299442ec540ca240d 100644 (file)
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -17,6 +17,7 @@ Source0:      http://ftp.gnu.org/gnu/texinfo/%{name}-%{version}.tar.xz
 # Source0-md5: 3715197e62e0e07f85860b3d7aab55ed
 Source1:       info.desktop
 Patch0:                %{name}-info.patch
 # Source0-md5: 3715197e62e0e07f85860b3d7aab55ed
 Source1:       info.desktop
 Patch0:                %{name}-info.patch

+Patch1:                regex-fix.patch

 URL:           http://www.gnu.org/software/texinfo/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.14
 URL:           http://www.gnu.org/software/texinfo/
 BuildRequires: autoconf >= 2.69
 BuildRequires: automake >= 1:1.14


@@ -187,6 +188,7 @@ Narzędzie do konwersji plików texinfo na dvi.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

+%patch1 -p1

 
 %build
 %{__aclocal} -I gnulib/m4
 
 %build
 %{__aclocal} -I gnulib/m4