diff --git a/texinfo-4.13a-bug713517.diff b/texinfo-4.13a-bug713517.diff new file mode 100644 index 0000000..4798e05 --- /dev/null +++ b/texinfo-4.13a-bug713517.diff @@ -0,0 +1,20 @@ +--- util/texi2dvi ++++ util/texi2dvi 2011-09-02 10:25:04.616426245 +0000 +@@ -78,7 +78,7 @@ newline=' + IFS="$space$tab$newline" + + # In case someone pedantic insists on using grep -E. +-: ${EGREP=egrep} ++: ${EGREP=grep -E} + + # Systems which define $COMSPEC or $ComSpec use semicolons to separate + # directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC +@@ -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.changes b/texinfo.changes index af73e6c..298478a 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 2 10:28:21 UTC 2011 - werner@suse.de + +- Fix UTF-8 range problem of a grep call (bnc#713517) + ------------------------------------------------------------------- Mon May 2 12:58:41 CEST 2011 - ke@suse.de diff --git a/texinfo.spec b/texinfo.spec index 7322a81..30af34a 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -44,6 +44,7 @@ Patch4: texinfo-4.12-zlib.patch Patch5: texinfo-4.8-echo.patch Patch6: texi2roff-2.0-gcc4.patch Patch7: texinfo-4.13a-bug640417.diff +Patch8: texinfo-4.13a-bug713517.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -110,6 +111,7 @@ rm -rf texi2html-%{version_t2h} texi2roff-%{version_t2r} %patch4 -p0 -b .zlib %patch5 -p0 -b .echo %patch7 -p1 -b .size_t +%patch8 -p0 -b .egrep %patch -p0 pushd ../texi2html-%{version_t2h} %patch1 -p0