From 7e86f75c6b8980409435d33d5fa859aca7f69bfe Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:17:01 +0000 Subject: import texinfo-5.1-5.el7 --- diff --git a/SOURCES/texinfo-5.1-enumerate-start-greater-than-nine-fix.patch b/SOURCES/texinfo-5.1-enumerate-start-greater-than-nine-fix.patch new file mode 100644 index 0000000..0efad00 --- /dev/null +++ b/SOURCES/texinfo-5.1-enumerate-start-greater-than-nine-fix.patch @@ -0,0 +1,234 @@ +diff -up texinfo-5.1/tp/t/converters_tests.t.orig texinfo-5.1/tp/t/converters_tests.t +--- texinfo-5.1/tp/t/converters_tests.t.orig 2013-02-19 23:25:47.000000000 +0100 ++++ texinfo-5.1/tp/t/converters_tests.t 2017-10-02 14:57:40.692452831 +0200 +@@ -707,6 +707,11 @@ explanation + in para + @image{f--ile,,,a very long alt argument that could span more than one line who knows}. + '], ++['enumerate_above_ten', ++'@enumerate 14 ++@item a ++@end enumerate ++'], + ['footnote_no_number', + '@node Top + +diff -up texinfo-5.1/tp/Texinfo/Common.pm.orig texinfo-5.1/tp/Texinfo/Common.pm +--- texinfo-5.1/tp/Texinfo/Common.pm.orig 2013-02-25 22:20:23.000000000 +0100 ++++ texinfo-5.1/tp/Texinfo/Common.pm 2017-10-02 14:57:40.689452828 +0200 +@@ -1382,7 +1382,7 @@ sub enumerate_item_representation($$) + my $specification = shift; + my $number = shift; + +- if ($specification =~ /^[0-9]$/) { ++ if ($specification =~ /^[0-9]+$/) { + return $specification + $number -1; + } + +diff -up texinfo-5.1/tp/Texinfo/Parser.pm.orig texinfo-5.1/tp/Texinfo/Parser.pm +--- texinfo-5.1/tp/Texinfo/Parser.pm.orig 2013-03-05 02:11:42.000000000 +0100 ++++ texinfo-5.1/tp/Texinfo/Parser.pm 2017-10-02 14:57:40.691452829 +0200 +@@ -2973,7 +2973,7 @@ sub _end_line($$$) + $current->{'cmdname'}); + } + my $arg = $current->{'extra'}->{'block_command_line_contents'}->[0]->[0]; +- if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^[[:alnum:]]$/) { ++ if (!defined($arg->{'text'}) or $arg->{'text'} !~ /^(([[:digit:]]+)|([[:alpha:]]+))$/) { + $self->_command_error($current, $line_nr, + $self->__("bad argument to \@%s"), + $current->{'cmdname'}); +diff -up texinfo-5.1/tp/t/results/converters_tests/enumerate_above_ten.pl.orig texinfo-5.1/tp/t/results/converters_tests/enumerate_above_ten.pl +--- texinfo-5.1/tp/t/results/converters_tests/enumerate_above_ten.pl.orig 2017-10-02 14:57:40.691452829 +0200 ++++ texinfo-5.1/tp/t/results/converters_tests/enumerate_above_ten.pl 2017-10-02 14:57:40.691452829 +0200 +@@ -0,0 +1,191 @@ ++use vars qw(%result_texis %result_texts %result_trees %result_errors ++ %result_indices %result_sectioning %result_nodes %result_menus ++ %result_floats %result_converted %result_converted_errors ++ %result_elements %result_directions_text); ++ ++use utf8; ++ ++$result_trees{'enumerate_above_ten'} = { ++ 'contents' => [ ++ { ++ 'args' => [ ++ { ++ 'contents' => [ ++ { ++ 'extra' => { ++ 'command' => {} ++ }, ++ 'parent' => {}, ++ 'text' => ' ', ++ 'type' => 'empty_spaces_after_command' ++ }, ++ { ++ 'parent' => {}, ++ 'text' => '14' ++ }, ++ { ++ 'parent' => {}, ++ 'text' => ' ++', ++ 'type' => 'space_at_end_block_command' ++ } ++ ], ++ 'parent' => {}, ++ 'type' => 'block_line_arg' ++ } ++ ], ++ 'cmdname' => 'enumerate', ++ 'contents' => [ ++ { ++ 'cmdname' => 'item', ++ 'contents' => [ ++ { ++ 'extra' => { ++ 'command' => {} ++ }, ++ 'parent' => {}, ++ 'text' => ' ', ++ 'type' => 'empty_spaces_after_command' ++ }, ++ { ++ 'contents' => [ ++ { ++ 'parent' => {}, ++ 'text' => 'a ++' ++ } ++ ], ++ 'parent' => {}, ++ 'type' => 'paragraph' ++ } ++ ], ++ 'extra' => { ++ 'item_number' => 1, ++ 'spaces_after_command' => {} ++ }, ++ 'line_nr' => { ++ 'file_name' => '', ++ 'line_nr' => 2, ++ 'macro' => '' ++ }, ++ 'parent' => {} ++ }, ++ { ++ 'args' => [ ++ { ++ 'contents' => [ ++ { ++ 'extra' => { ++ 'command' => {} ++ }, ++ 'parent' => {}, ++ 'text' => ' ', ++ 'type' => 'empty_spaces_after_command' ++ }, ++ { ++ 'parent' => {}, ++ 'text' => 'enumerate' ++ }, ++ { ++ 'parent' => {}, ++ 'text' => ' ++', ++ 'type' => 'spaces_at_end' ++ } ++ ], ++ 'parent' => {}, ++ 'type' => 'misc_line_arg' ++ } ++ ], ++ 'cmdname' => 'end', ++ 'extra' => { ++ 'command' => {}, ++ 'command_argument' => 'enumerate', ++ 'spaces_after_command' => {}, ++ 'text_arg' => 'enumerate' ++ }, ++ 'line_nr' => { ++ 'file_name' => '', ++ 'line_nr' => 3, ++ 'macro' => '' ++ }, ++ 'parent' => {} ++ } ++ ], ++ 'extra' => { ++ 'block_command_line_contents' => [ ++ [ ++ {} ++ ] ++ ], ++ 'end_command' => {}, ++ 'enumerate_specification' => '14', ++ 'spaces_after_command' => {} ++ }, ++ 'line_nr' => { ++ 'file_name' => '', ++ 'line_nr' => 1, ++ 'macro' => '' ++ }, ++ 'parent' => {} ++ } ++ ], ++ 'type' => 'text_root' ++}; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'contents'}[0]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[0]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'extra'}{'command'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[1]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[2]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'extra'}{'command'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'extra'}{'spaces_after_command'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'args'}[0]{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]{'parent'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'extra'}{'block_command_line_contents'}[0][0] = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]{'contents'}[1]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'extra'}{'end_command'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'contents'}[1]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'extra'}{'spaces_after_command'} = $result_trees{'enumerate_above_ten'}{'contents'}[0]{'args'}[0]{'contents'}[0]; ++$result_trees{'enumerate_above_ten'}{'contents'}[0]{'parent'} = $result_trees{'enumerate_above_ten'}; ++ ++$result_texis{'enumerate_above_ten'} = '@enumerate 14 ++@item a ++@end enumerate ++'; ++ ++ ++$result_texts{'enumerate_above_ten'} = '14. a ++'; ++ ++$result_errors{'enumerate_above_ten'} = []; ++ ++ ++ ++$result_converted{'plaintext'}->{'enumerate_above_ten'} = ' 14. a ++'; ++ ++ ++$result_converted{'html_text'}->{'enumerate_above_ten'} = '
    ++
  1. a ++
++'; ++ ++ ++$result_converted{'xml'}->{'enumerate_above_ten'} = '14 ++a ++ ++'; ++ ++ ++$result_converted{'docbook'}->{'enumerate_above_ten'} = 'a ++'; ++ ++1; diff --git a/SOURCES/texinfo-5.1-pod-simple-texinfo-test-fail-fix.patch b/SOURCES/texinfo-5.1-pod-simple-texinfo-test-fail-fix.patch new file mode 100644 index 0000000..6d1eaeb --- /dev/null +++ b/SOURCES/texinfo-5.1-pod-simple-texinfo-test-fail-fix.patch @@ -0,0 +1,40 @@ +diff -up texinfo-5.1/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t.orig texinfo-5.1/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t +--- texinfo-5.1/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t.orig 2013-02-19 23:25:28.000000000 +0100 ++++ texinfo-5.1/Pod-Simple-Texinfo/t/Pod-Simple-Texinfo.t 2017-10-02 14:39:20.134383675 +0200 +@@ -50,6 +50,10 @@ X + + ', 'index in head'); + ++TODO: { ++ ++local $TODO = 'Pod::Simple not ignoring correctly X<>'; ++ + run_test ('=head1 NAME + X + ', +@@ -59,6 +63,8 @@ X + + ', 'index in head node', 1, 2); + ++} ++ + run_test ('=head1 NAME + + T@c +@@ -138,6 +144,8 @@ Para + run_test('=over + + =item L ++ ++=back + ', '@table @asis + @item @ref{somewhere} + @anchor{somewhere} +@@ -176,6 +184,7 @@ run_test('=over + + =item a L + ++=back + ', '@table @asis + @item a @ref{, pod2text,, pod2text} + @anchor{a pod2text} diff --git a/SPECS/texinfo.spec b/SPECS/texinfo.spec index ab7b840..301798f 100644 --- a/SPECS/texinfo.spec +++ b/SPECS/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 5.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ @@ -14,6 +14,10 @@ Patch0: texinfo-4.12-zlib.patch Patch1: texinfo-4.13a-powerpc.patch # Patch2: bz#1053129, already upstream Patch2: texinfo-5.2-non-existing-info-page-segfault.patch +# Patch3: bz#970986, already upstream +Patch3: texinfo-5.1-pod-simple-texinfo-test-fail-fix.patch +# Patch4: bz#1134160, already upstream +Patch4: texinfo-5.1-enumerate-start-greater-than-nine-fix.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: perl >= 5.7.3, perl(Text::Unidecode) @@ -60,6 +64,8 @@ for printing using TeX. %patch0 -p1 -b .zlib %patch1 -p1 -b .powerpc %patch2 -p1 -b .non-existing-info-page-segfault +%patch3 -p1 -b .pod-simple-texinfo-test-fail-fix +%patch4 -p1 -b .enumerate-start-greater-than-nine-fix %build %configure --with-external-Text-Unidecode \ @@ -154,6 +160,12 @@ fi %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Oct 02 2017 Vitezslav Crhonek - 5.1-5 +- Fix upstream test failure in Pod-Simple-Texinfo + Resolves: #970986 +- Fix @enumerate does not support start numbers greater than nine + Resolves: #1134160 + * Fri Jan 24 2014 Daniel Mach - 5.1-4 - Mass rebuild 2014-01-24