Dominique Leuenberger 2018-12-10 11:21:31 +00:00 committed by Git OBS Bridge
parent 9c27017df7
commit 5ce6dc3eaa
3 changed files with 50 additions and 5 deletions

32
perl-5.28-fixes.patch Normal file
View File

@ -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

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Nov 22 17:59:13 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Use noun phrase for summaries.
-------------------------------------------------------------------
Tue Oct 30 13:15:15 UTC 2018 - Dr. Werner Fink <werner@suse.de>
- Add patch perl-5.28-fixes.patch to get build cehck working again
due broken perl API with perl 5.28 and up (boo#1113945)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 6 09:02:47 UTC 2018 - adam.majer@suse.de Fri Apr 6 09:02:47 UTC 2018 - adam.majer@suse.de

View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -21,8 +21,8 @@
Name: texinfo Name: texinfo
Version: 6.5 Version: 6.5
Release: 0 Release: 0
Summary: Tools Needed to Create Documentation from Texinfo Sources Summary: Tools for creating documentation from texinfo sources
License: GPL-3.0+ License: GPL-3.0-or-later
Group: Productivity/Publishing/Texinfo Group: Productivity/Publishing/Texinfo
Url: https://www.gnu.org/software/texinfo/ Url: https://www.gnu.org/software/texinfo/
Source0: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz Source0: https://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.xz
@ -31,6 +31,7 @@ Source2: %{name}.keyring
Source10: info-dir Source10: info-dir
Patch1: texinfo-zlib.patch Patch1: texinfo-zlib.patch
Patch2: install-info_exitcode.patch Patch2: install-info_exitcode.patch
Patch3: perl-5.28-fixes.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: help2man BuildRequires: help2man
BuildRequires: libbz2-devel BuildRequires: libbz2-devel
@ -76,7 +77,7 @@ on-line manuals in the Info format, so you need a program called "Info
reader" to read the manuals. reader" to read the manuals.
%package -n makeinfo %package -n makeinfo
Summary: Translate Texinfo documents to info format Summary: Translator for converting texinfo documents to info format
# /usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm uses Text::Unidecode # /usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm uses Text::Unidecode
Group: Productivity/Publishing/Texinfo Group: Productivity/Publishing/Texinfo
Requires: perl(Text::Unidecode) Requires: perl(Text::Unidecode)
@ -85,7 +86,7 @@ Suggests: texinfo
Provides: texinfo:%{_bindir}/makeinfo Provides: texinfo:%{_bindir}/makeinfo
%description -n makeinfo %description -n makeinfo
Makeinfo translates Texinfo source documentation to various other Makeinfo translates Texinfo source documentation to various other
formats, by default Info files suitable for reading online with Emacs formats, by default Info files suitable for reading online with Emacs
or standalone GNU Info. or standalone GNU Info.
@ -93,6 +94,7 @@ or standalone GNU Info.
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
LANG=en_GB.UTF-8 LANG=en_GB.UTF-8