auto-import grep-2.5.1-17.2 from grep-2.5.1-17.2.src.rpm

This commit is contained in:
cvsdist 2004-09-09 05:53:26 +00:00
parent 438e8dfad3
commit fd96adda29
2 changed files with 21 additions and 5 deletions

View File

@ -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.manpage 2002-01-22 13:20:04.000000000 +0000
+++ grep-2.5.1/doc/grep.1 2003-06-10 10:05:16.000000000 +0100 +++ grep-2.5.1/doc/grep.1 2003-10-08 09:37:32.000000000 +0100
@@ -191,6 +191,7 @@ @@ -191,6 +191,7 @@
.I PATTERN .I PATTERN
as a list of fixed strings, separated by newlines, as a list of fixed strings, separated by newlines,
@ -8,3 +8,12 @@
.BR \-P ", " \-\^\-perl-regexp .BR \-P ", " \-\^\-perl-regexp
Interpret Interpret
.I PATTERN .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

View File

@ -1,5 +1,5 @@
%define beta %nil %define beta %nil
%define rel 17 %define rel 17.2
Summary: The GNU versions of grep pattern matching utilities. Summary: The GNU versions of grep pattern matching utilities.
Name: grep Name: grep
Version: 2.5.1 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 Patch0: grep-2.5.1-oi.patch
Patch1: grep-2.5-i18n.patch Patch1: grep-2.5-i18n.patch
Patch2: grep-2.5.1-manpage.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 Patch3: grep-2.5.1-gofast.patch
Patch4: grep-2.5.1-efgrep.patch Patch4: grep-2.5.1-efgrep.patch
Prefix: %{_prefix} Prefix: %{_prefix}
@ -37,7 +36,7 @@ utility for searching through text.
%patch0 -p1 -b .oi %patch0 -p1 -b .oi
%patch1 -p1 -b .i18n %patch1 -p1 -b .i18n
%patch2 -p1 -b .manpage %patch2 -p1 -b .manpage
#%patch3 -p1 -b .gofast %patch3 -p1 -b .gofast
%patch4 -p1 -b .efgrep %patch4 -p1 -b .efgrep
%build %build
@ -82,6 +81,14 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %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 * Thu Sep 18 2003 Tim Waugh <twaugh@redhat.com> 2.5.1-17
- Use symlinks for egrep/fgrep, rather than shell script wrappers. - Use symlinks for egrep/fgrep, rather than shell script wrappers.