diff --git a/grep-2.18-help-align.patch b/grep-2.19-help-align.patch similarity index 90% rename from grep-2.18-help-align.patch rename to grep-2.19-help-align.patch index ea151ec..40d15fe 100644 --- a/grep-2.18-help-align.patch +++ b/grep-2.19-help-align.patch @@ -1,8 +1,8 @@ -diff --git a/src/main.c b/src/main.c -index 9c0eaf2..07e001c 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1597,16 +1597,19 @@ Output control:\n\ +diff --git a/src/grep.c b/src/grep.c +index 7e07f06..3e5d6dc 100644 +--- a/src/grep.c ++++ b/src/grep.c +@@ -1583,16 +1583,19 @@ Output control:\n\ -D, --devices=ACTION how to handle devices, FIFOs and sockets;\n\ ACTION is 'read' or 'skip'\n\ -r, --recursive like --directories=recurse\n\ diff --git a/grep-2.18-man-fix-gs.patch b/grep-2.19-man-fix-gs.patch similarity index 91% rename from grep-2.18-man-fix-gs.patch rename to grep-2.19-man-fix-gs.patch index 757abf2..0c373df 100644 --- a/grep-2.18-man-fix-gs.patch +++ b/grep-2.19-man-fix-gs.patch @@ -46,11 +46,11 @@ index 58a6c0e..3e6a8cf 100644 .SS "File and Directory Selection" .TP .BR \-a ", " \-\^\-text -diff --git a/src/main.c b/src/main.c -index 56ec6b3..9c0eaf2 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1620,6 +1620,8 @@ Context control:\n\ +diff --git a/src/grep.c b/src/grep.c +index ec955d8..7e07f06 100644 +--- a/src/grep.c ++++ b/src/grep.c +@@ -1606,6 +1606,8 @@ Context control:\n\ ")); printf (_("\ -NUM same as --context=NUM\n\ diff --git a/grep.spec b/grep.spec index b15f57f..a789abc 100644 --- a/grep.spec +++ b/grep.spec @@ -2,7 +2,7 @@ Summary: Pattern matching utilities Name: grep -Version: 2.18 +Version: 2.19 Release: 1%{?dist} License: GPLv3+ Group: Applications/Text @@ -11,9 +11,9 @@ Source1: colorgrep.sh Source2: colorgrep.csh Source3: GREP_COLORS # upstream ticket 39444 -Patch0: grep-2.18-man-fix-gs.patch +Patch0: grep-2.19-man-fix-gs.patch # upstream ticket 39445 -Patch1: grep-2.18-help-align.patch +Patch1: grep-2.19-help-align.patch URL: http://www.gnu.org/software/grep/ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -85,6 +85,10 @@ fi %{_mandir}/*/* %changelog +* Fri May 23 2014 Jaroslav Škarvada - 2.19-1 +- New version + Resolves: rhbz#1100653 + * Wed Feb 26 2014 Jaroslav Škarvada - 2.18-1 - New version Resolves: rhbz#1070127 diff --git a/sources b/sources index 6bd31c9..e76df62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7439f8266f50844b56cc3e2721606541 grep-2.18.tar.xz +ac732142227d9fe9567d71301e127979 grep-2.19.tar.xz