From fd96adda29ec067c10f0459e0efd53effee258c4 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 05:53:26 +0000
Subject: auto-import grep-2.5.1-17.2 from grep-2.5.1-17.2.src.rpm


---

diff --git a/grep-2.5.1-manpage.patch b/grep-2.5.1-manpage.patch
index 96b945d..284f0c4 100644
--- a/grep-2.5.1-manpage.patch
+++ b/grep-2.5.1-manpage.patch
@@ -1,5 +1,5 @@
---- grep-2.5.1/doc/grep.1.manpage	2003-06-10 10:04:14.000000000 +0100
-+++ grep-2.5.1/doc/grep.1	2003-06-10 10:05:16.000000000 +0100
+--- grep-2.5.1/doc/grep.1.manpage	2002-01-22 13:20:04.000000000 +0000
++++ grep-2.5.1/doc/grep.1	2003-10-08 09:37:32.000000000 +0100
 @@ -191,6 +191,7 @@
  .I PATTERN
  as a list of fixed strings, separated by newlines,
@@ -8,3 +8,12 @@
  .BR \-P ", " \-\^\-perl-regexp
  Interpret
  .I PATTERN
+@@ -302,7 +303,7 @@
+ This is especially useful for tools like zgrep, e.g.
+ .B "gzip -cd foo.gz |grep --label=foo something"
+ .TP
+-.BR \-\^\-line-buffering
++.BR \-\^\-line-buffered
+ Use line buffering, it can be a performance penality.
+ .TP
+ .BR \-q ", " \-\^\-quiet ", " \-\^\-silent
diff --git a/grep.spec b/grep.spec
index 8da371a..7caae51 100644
--- a/grep.spec
+++ b/grep.spec
@@ -1,5 +1,5 @@
 %define beta %nil
-%define rel 17
+%define rel 17.2
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
@@ -14,7 +14,6 @@ Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}%{beta}.tar.bz2
 Patch0: grep-2.5.1-oi.patch
 Patch1: grep-2.5-i18n.patch
 Patch2: grep-2.5.1-manpage.patch
-# This patch isn't applied; it doesn't work (but shows where the problem is.)
 Patch3: grep-2.5.1-gofast.patch
 Patch4: grep-2.5.1-efgrep.patch
 Prefix: %{_prefix}
@@ -37,7 +36,7 @@ utility for searching through text.
 %patch0 -p1 -b .oi
 %patch1 -p1 -b .i18n
 %patch2 -p1 -b .manpage
-#%patch3 -p1 -b .gofast
+%patch3 -p1 -b .gofast
 %patch4 -p1 -b .efgrep
 
 %build
@@ -82,6 +81,14 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Fri Nov 21 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-17.2
+- Another two multibyte efficiency bug-fixes (bug #110524).
+
+* Tue Nov 11 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-17.1
+- Fixed man page bug (bug #106267).
+- Turn on multibyte efficiency patch again.
+- Fixed a multibyte efficiency bug.
+
 * Thu Sep 18 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-17
 - Use symlinks for egrep/fgrep, rather than shell script wrappers.