Fix incopatible regexp with the lates version of egrep in texi2dvi script

This commit is contained in:
Vitezslav Crhonek 2010-10-11 14:47:27 +02:00
parent a76aa943cf
commit 1cbcd7e233
2 changed files with 21 additions and 2 deletions

View File

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

View File

@ -3,7 +3,7 @@
Summary: Tools needed to create Texinfo format documentation files Summary: Tools needed to create Texinfo format documentation files
Name: texinfo Name: texinfo
Version: 4.13a Version: 4.13a
Release: 10%{?dist} Release: 11%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Publishing Group: Applications/Publishing
Url: http://www.gnu.org/software/texinfo/ Url: http://www.gnu.org/software/texinfo/
@ -17,10 +17,12 @@ Patch2: texinfo-4.13a-mosdo-crash.patch
Patch3: texinfo-4.13a-powerpc.patch Patch3: texinfo-4.13a-powerpc.patch
# Patch4: accepted by upstream, bz579263 # Patch4: accepted by upstream, bz579263
Patch4: texinfo-4.13a-help-index-segfault.patch 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(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel, ncurses-devel BuildRequires: zlib-devel, ncurses-devel, help2man
%description %description
Texinfo is a documentation system that can produce both online Texinfo is a documentation system that can produce both online
@ -63,6 +65,7 @@ for printing using TeX.
%patch2 -p1 -b .mosdo-crash %patch2 -p1 -b .mosdo-crash
%patch3 -p1 -b .powerpc %patch3 -p1 -b .powerpc
%patch4 -p1 -b .help-index-segfault %patch4 -p1 -b .help-index-segfault
%patch5 -p1 -b .texi2dvi-regexp
%build %build
%configure %configure
@ -162,6 +165,10 @@ fi
%{_mandir}/man1/pdftexi2dvi.1* %{_mandir}/man1/pdftexi2dvi.1*
%changelog %changelog
* Mon Oct 11 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.13a-11
- Fix incopatible regexp with the lates version of egrep in texi2dvi script
Resolves: #641534
* Tue Aug 31 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.13a-10 * Tue Aug 31 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 4.13a-10
- Fix info crash when using index in help window - Fix info crash when using index in help window
Resolves: #579263 Resolves: #579263