diff --git a/grep-2.26-help-align.patch b/grep-2.27-help-align.patch similarity index 95% rename from grep-2.26-help-align.patch rename to grep-2.27-help-align.patch index 7481556..9aa4011 100644 --- a/grep-2.26-help-align.patch +++ b/grep-2.27-help-align.patch @@ -1,8 +1,8 @@ diff --git a/src/grep.c b/src/grep.c -index e85d52e..6154a72 100644 +index d567fcb..c4ffad2 100644 --- a/src/grep.c +++ b/src/grep.c -@@ -1954,17 +1954,20 @@ Output control:\n\ +@@ -1996,17 +1996,20 @@ 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.26-man-fix-gs.patch b/grep-2.27-man-fix-gs.patch similarity index 95% rename from grep-2.26-man-fix-gs.patch rename to grep-2.27-man-fix-gs.patch index 16df85f..caa33fe 100644 --- a/grep-2.26-man-fix-gs.patch +++ b/grep-2.27-man-fix-gs.patch @@ -47,10 +47,10 @@ index 05f3382..f83750c 100644 .TP .BR \-a ", " \-\^\-text diff --git a/src/grep.c b/src/grep.c -index 3b85561..e85d52e 100644 +index 4538f22..d567fcb 100644 --- a/src/grep.c +++ b/src/grep.c -@@ -1978,6 +1978,8 @@ Context control:\n\ +@@ -2020,6 +2020,8 @@ Context control:\n\ ")); printf (_("\ -NUM same as --context=NUM\n\ diff --git a/grep.spec b/grep.spec index c953948..6397cee 100644 --- a/grep.spec +++ b/grep.spec @@ -2,8 +2,8 @@ Summary: Pattern matching utilities Name: grep -Version: 2.26 -Release: 2%{?dist} +Version: 2.27 +Release: 1%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/grep/ Group: Applications/Text @@ -14,9 +14,9 @@ Source2: colorgrep.csh Source3: GREP_COLORS Source4: grepconf.sh # upstream ticket 39444 -Patch0: grep-2.26-man-fix-gs.patch +Patch0: grep-2.27-man-fix-gs.patch # upstream ticket 39445 -Patch1: grep-2.26-help-align.patch +Patch1: grep-2.27-help-align.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -86,6 +86,11 @@ fi %{_libexecdir}/grepconf.sh %changelog +* Wed Dec 7 2016 Jaroslav Škarvada - 2.27-1 +- New version + Resolves: rhbz#1402379 +- De-fuzzified patches + * Wed Oct 5 2016 Jaroslav Škarvada - 2.26-2 - Re-enabled 'make check', glibc seems fixed diff --git a/sources b/sources index d705bb7..9773447 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -afdd61c7221434722671baf002ac9267 grep-2.26.tar.xz +6138dd227c39d4a25f81eea76a44d4cb grep-2.27.tar.xz