diff --git a/grep-2.5.1-color.patch b/grep-2.5.1-color.patch new file mode 100644 index 0000000..89cb6e9 --- /dev/null +++ b/grep-2.5.1-color.patch @@ -0,0 +1,10 @@ +--- grep-2.5.1/src/grep.c.color 2004-11-16 13:23:56.679753084 +0000 ++++ grep-2.5.1/src/grep.c 2004-11-16 13:23:52.400568021 +0000 +@@ -608,6 +608,7 @@ + beg = b + match_size; + } + } ++ fputs ("\33[K", stdout); + fwrite (beg, 1, lim - beg, stdout); + if (ferror (stdout)) + error (0, errno, _("writing output")); diff --git a/grep.spec b/grep.spec index 29a621c..a822b90 100644 --- a/grep.spec +++ b/grep.spec @@ -1,7 +1,7 @@ Summary: The GNU versions of grep pattern matching utilities. Name: grep Version: 2.5.1 -Release: 37 +Release: 38 License: GPL Group: Applications/Text Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.bz2 @@ -10,8 +10,9 @@ Patch1: grep-2.5.1-bracket.patch Patch2: grep-2.5-i18n.patch Patch3: grep-2.5.1-oi.patch Patch4: grep-2.5.1-manpage.patch -Patch5: grep-2.5.1-egf-speedup.patch -Patch6: grep-2.5.1-dfa-optional.patch +Patch5: grep-2.5.1-color.patch +Patch10: grep-2.5.1-egf-speedup.patch +Patch11: grep-2.5.1-dfa-optional.patch URL: http://www.gnu.org/software/grep/ Prereq: /sbin/install-info Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -34,8 +35,9 @@ utility for searching through text. %patch2 -p1 -b .i18n %patch3 -p1 -b .oi %patch4 -p1 -b .manpage -%patch5 -p1 -b .egf-speedup -%patch6 -p1 -b .dfa-optional +%patch5 -p1 -b .color +%patch10 -p1 -b .egf-speedup +%patch11 -p1 -b .dfa-optional %build [ ! -e configure ] && ./autogen.sh @@ -83,6 +85,10 @@ fi %{_mandir}/*/* %changelog +* Tue Nov 16 2004 Tim Waugh 2.5.1-38 +- Applied patch from Karsten Hopp to fix background colour problems with + --color output (bug #138913). + * Wed Nov 10 2004 Tim Waugh 2.5.1-37 - Prevent false matches when DFA is disabled (bug #138558).