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

Fri Nov 21 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.6
- Fixed man page (bug #106267).
- Fixed another three multibyte efficiency bugs.
- Fixed debuginfo package.
Thu Jun 26 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.5
- Fixed grep -i bug introduced by cache.
Mon Jun 23 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.4
- Redo the gofast patch (bug #97785).
Thu Jun 12 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.3
- Fixed a bug in the gofast patch (bug #97226).
Tue Jun 10 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.2
- Go faster (bug #69900).
Thu May 29 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.1
- Go fast (bug #69900).

---

diff --git a/grep-2.5.1-manpage.patch b/grep-2.5.1-manpage.patch
new file mode 100644
index 0000000..284f0c4
--- /dev/null
+++ b/grep-2.5.1-manpage.patch
@@ -0,0 +1,19 @@
+--- 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,
+ any of which is to be matched.
++.TP
+ .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 9e8afcb..76ccb07 100644
--- a/grep.spec
+++ b/grep.spec
@@ -1,5 +1,5 @@
 %define beta %nil
-%define rel 7
+%define rel 7.6
 Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.1
@@ -13,6 +13,8 @@ Group: Applications/Text
 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-gofast.patch
+Patch3: grep-2.5.1-manpage.patch
 Prefix: %{_prefix}
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
@@ -32,11 +34,13 @@ utility for searching through text.
 %setup -q -n %{name}-%{version}%{beta}
 %patch0 -p1 -b .oi
 %patch1 -p1 -b .i18n
+%patch2 -p1 -b .gofast
+%patch3 -p1 -b .manpage
 
 %build
 [ ! -e configure ] && ./autogen.sh
 %configure --prefix=/usr --without-included-regex
-make
+make CFLAGS="$RPM_OPT_FLAGS -I/usr/include/pcre"
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -75,7 +79,27 @@ fi
 %{_mandir}/*/*
 
 %changelog
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+* Fri Nov 21 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.6
+- Fixed man page (bug #106267).
+- Fixed another three multibyte efficiency bugs.
+- Fixed debuginfo package.
+
+* Thu Jun 26 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.5
+- Fixed grep -i bug introduced by cache.
+
+* Mon Jun 23 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.4
+- Redo the gofast patch (bug #97785).
+
+* Thu Jun 12 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.3
+- Fixed a bug in the gofast patch (bug #97226).
+
+* Tue Jun 10 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.2
+- Go faster (bug #69900).
+
+* Thu May 29 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-7.1
+- Go fast (bug #69900).
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com> 2.5.1-7
 - rebuilt
 
 * Tue Nov 19 2002 Tim Waugh <twaugh@redhat.com> 2.5.1-6