rpms/grep
7
0
Fork 0
Code Issues Pull Requests Releases Activity

New version

Browse Source 
Resolves: rhbz#1070127
- De-fuzzified patches
This commit is contained in:
Jaroslav Škarvada 2014-02-26 11:33:14 +01:00
parent d3ff09e316
commit 2f5b7f86a4
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grep-2.17-help-align.patch → grep-2.18-help-align.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/main.c b/src/main.c diff --git a/src/main.c b/src/main.c
index cc4ace3..e20d36c 100644 index 9c0eaf2..07e001c 100644
--- a/src/main.c --- a/src/main.c
+++ b/src/main.c +++ b/src/main.c
@@ -1596,16 +1596,19 @@ Output control:\n\ @@ -1597,16 +1597,19 @@ Output control:\n\
-D, --devices=ACTION how to handle devices, FIFOs and sockets;\n\ -D, --devices=ACTION how to handle devices, FIFOs and sockets;\n\
ACTION is 'read' or 'skip'\n\ ACTION is 'read' or 'skip'\n\
-r, --recursive like --directories=recurse\n\ -r, --recursive like --directories=recurse\n\

4
grep-2.17-man-fix-gs.patch → grep-2.18-man-fix-gs.patch
View File

@ -47,10 +47,10 @@ index 58a6c0e..3e6a8cf 100644
.TP .TP
.BR \-a ", " \-\^\-text .BR \-a ", " \-\^\-text
diff --git a/src/main.c b/src/main.c diff --git a/src/main.c b/src/main.c
index bd20297..cc4ace3 100644 index 56ec6b3..9c0eaf2 100644
--- a/src/main.c --- a/src/main.c
+++ b/src/main.c +++ b/src/main.c
@@ -1619,6 +1619,8 @@ Context control:\n\ @@ -1620,6 +1620,8 @@ Context control:\n\
")); "));
printf (_("\ printf (_("\
-NUM same as --context=NUM\n\ -NUM same as --context=NUM\n\

11
grep.spec
View File

@ -2,7 +2,7 @@
Summary: Pattern matching utilities Summary: Pattern matching utilities
Name: grep Name: grep
Version: 2.17 Version: 2.18
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Text Group: Applications/Text
@ -11,9 +11,9 @@ Source1: colorgrep.sh
Source2: colorgrep.csh Source2: colorgrep.csh
Source3: GREP_COLORS Source3: GREP_COLORS
# upstream ticket 39444 # upstream ticket 39444
Patch0: grep-2.17-man-fix-gs.patch Patch0: grep-2.18-man-fix-gs.patch
# upstream ticket 39445 # upstream ticket 39445
Patch1: grep-2.17-help-align.patch Patch1: grep-2.18-help-align.patch
URL: http://www.gnu.org/software/grep/ URL: http://www.gnu.org/software/grep/
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info Requires(preun): /sbin/install-info
@ -85,6 +85,11 @@ fi
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Wed Feb 26 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.18-1
- New version
Resolves: rhbz#1070127
- De-fuzzified patches
* Tue Feb 18 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.17-1 * Tue Feb 18 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.17-1
- New version - New version
Resolves: rhbz#1066310 Resolves: rhbz#1066310

2
sources
View File

@ -1 +1 @@
3b1f0cbf1139e76171f790665b1b41cf grep-2.17.tar.xz 7439f8266f50844b56cc3e2721606541 grep-2.18.tar.xz