Fix fail of test because of unescaped left brace with Perl 5.28

This commit is contained in:
Vitezslav Crhonek 2018-06-21 14:11:08 +02:00
parent 1225667fb6
commit c1f52b11dd
2 changed files with 25 additions and 1 deletions

View File

@ -0,0 +1,17 @@
diff -up texinfo-6.5/tp/Texinfo/Parser.pm.orig texinfo-6.5/tp/Texinfo/Parser.pm
--- texinfo-6.5/tp/Texinfo/Parser.pm.orig 2018-06-12 13:40:29.356030136 +0200
+++ texinfo-6.5/tp/Texinfo/Parser.pm 2018-06-12 13:41:28.357725639 +0200
@@ -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->__(

View File

@ -3,7 +3,7 @@
Summary: Tools needed to create Texinfo format documentation files
Name: texinfo
Version: 6.5
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv3+
Url: http://www.gnu.org/software/texinfo/
Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
@ -21,6 +21,8 @@ Patch3: info-6.5-sync-fix-info-dir.patch
Patch4: texinfo-20180310-texinfo.tex.patch
# rhbz#1592433, bug in fix-info-dir --delete
Patch5: texinfo-6.5-fix-info-dir.patch
# Patch6: rhbz#1590308, fixes test fail with unescaped left brace
Patch6: texinfo-6.5-fix-for-perl-5.28.patch
BuildRequires: gcc
BuildRequires: perl-generators
@ -147,6 +149,11 @@ export ALL_TESTS=yes
%{_mandir}/man1/pdftexi2dvi.1*
%changelog
* Thu Jun 21 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 6.5-6
- Fix fail of test because of unescaped left brace with Perl 5.28
(patch by Jitka Plesnikova)
Resolves: #1590308
* Tue Jun 19 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 6.5-5
- Fix bug in fix-info-dir which prevented the transfiletriggerpostun script
from working properly.