diff --git a/grep-2.16-help-align.patch b/grep-2.17-help-align.patch similarity index 95% rename from grep-2.16-help-align.patch rename to grep-2.17-help-align.patch index d94d46b..ae0b26b 100644 --- a/grep-2.16-help-align.patch +++ b/grep-2.17-help-align.patch @@ -1,8 +1,8 @@ diff --git a/src/main.c b/src/main.c -index 7c1bd60..6b7a932 100644 +index cc4ace3..e20d36c 100644 --- a/src/main.c +++ b/src/main.c -@@ -1598,16 +1598,19 @@ Output control:\n\ +@@ -1596,16 +1596,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.16-man-fix-gs.patch b/grep-2.17-man-fix-gs.patch similarity index 94% rename from grep-2.16-man-fix-gs.patch rename to grep-2.17-man-fix-gs.patch index 2352919..2fc9a44 100644 --- a/grep-2.16-man-fix-gs.patch +++ b/grep-2.17-man-fix-gs.patch @@ -1,5 +1,5 @@ diff --git a/doc/grep.in.1 b/doc/grep.in.1 -index d91de8c..9e8d8d2 100644 +index 58a6c0e..3e6a8cf 100644 --- a/doc/grep.in.1 +++ b/doc/grep.in.1 @@ -377,7 +377,7 @@ Print @@ -47,10 +47,10 @@ index d91de8c..9e8d8d2 100644 .TP .BR \-a ", " \-\^\-text diff --git a/src/main.c b/src/main.c -index 44090be..7c1bd60 100644 +index bd20297..cc4ace3 100644 --- a/src/main.c +++ b/src/main.c -@@ -1621,6 +1621,8 @@ Context control:\n\ +@@ -1619,6 +1619,8 @@ Context control:\n\ ")); printf (_("\ -NUM same as --context=NUM\n\ diff --git a/grep.spec b/grep.spec index 90a0fab..14f812b 100644 --- a/grep.spec +++ b/grep.spec @@ -2,7 +2,7 @@ Summary: Pattern matching utilities Name: grep -Version: 2.16 +Version: 2.17 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.16-man-fix-gs.patch +Patch0: grep-2.17-man-fix-gs.patch # upstream ticket 39445 -Patch1: grep-2.16-help-align.patch +Patch1: grep-2.17-help-align.patch URL: http://www.gnu.org/software/grep/ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -85,6 +85,11 @@ fi %{_mandir}/*/* %changelog +* Tue Feb 18 2014 Jaroslav Škarvada - 2.17-1 +- New version + Resolves: rhbz#1066310 +- De-fuzzified patches + * Thu Jan 2 2014 Jaroslav Škarvada - 2.16-1 - New version Resolves: rhbz#1047813 diff --git a/sources b/sources index dc6947d..f454ee5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -502350a6c8f7c2b12ee58829e760b44d grep-2.16.tar.xz +3b1f0cbf1139e76171f790665b1b41cf grep-2.17.tar.xz