From 5a45b09f783c70140ed5883b4e83fa313bd4ce27 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Oct 11 2010 13:19:25 +0000 Subject: Fix incompatible regexp with the latest version of egrep in texi2dvi script --- diff --git a/texinfo-4.13a-texi2dvi-regexp.patch b/texinfo-4.13a-texi2dvi-regexp.patch new file mode 100644 index 0000000..54dabac --- /dev/null +++ b/texinfo-4.13a-texi2dvi-regexp.patch @@ -0,0 +1,12 @@ +diff -up texinfo-4.13/util/texi2dvi.orig texinfo-4.13/util/texi2dvi +--- texinfo-4.13/util/texi2dvi.orig 2010-10-11 14:08:21.340831908 +0200 ++++ texinfo-4.13/util/texi2dvi 2010-10-11 14:12:14.235841752 +0200 +@@ -1683,7 +1683,7 @@ input_file_name_decode () + + # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex), + # prepend `./' in order to avoid that the tools take it as an option. +- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \ ++ echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \ + || command_line_filename="./$command_line_filename" + + # See if the file exists. If it doesn't we're in trouble since, even diff --git a/texinfo.spec b/texinfo.spec index 3b59e88..48981a6 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -3,7 +3,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 4.13a -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ @@ -17,10 +17,12 @@ Patch2: texinfo-4.13a-mosdo-crash.patch Patch3: texinfo-4.13a-powerpc.patch # Patch4: accepted by upstream, bz579263 Patch4: texinfo-4.13a-help-index-segfault.patch +# Patch5: already upstream, bz641534 +Patch5: texinfo-4.13a-texi2dvi-regexp.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: zlib-devel, ncurses-devel +BuildRequires: zlib-devel, ncurses-devel, help2man %description Texinfo is a documentation system that can produce both online @@ -63,6 +65,7 @@ for printing using TeX. %patch2 -p1 -b .mosdo-crash %patch3 -p1 -b .powerpc %patch4 -p1 -b .help-index-segfault +%patch5 -p1 -b .texi2dvi-regexp %build %configure @@ -162,6 +165,10 @@ fi %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Oct 11 2010 Vitezslav Crhonek - 4.13a-11 +- Fix incompatible regexp with the latest version of egrep in texi2dvi script + Resolves: #641534 + * Tue Aug 31 2010 Vitezslav Crhonek - 4.13a-10 - Fix info crash when using index in help window Resolves: #579263