From f347452d644bf33b17536ac55c01830db693daad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Wed, 8 Feb 2017 10:58:15 +0100
Subject: [PATCH] New version   Resolves: rhbz#1419921 De-fuzzified patches

---
 ....27-help-align.patch => grep-2.28-help-align.patch |  4 ++--
 ....27-man-fix-gs.patch => grep-2.28-man-fix-gs.patch |  6 +++---
 grep.spec                                             | 11 ++++++++---
 sources                                               |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)
 rename grep-2.27-help-align.patch => grep-2.28-help-align.patch (95%)
 rename grep-2.27-man-fix-gs.patch => grep-2.28-man-fix-gs.patch (94%)

diff --git a/grep-2.27-help-align.patch b/grep-2.28-help-align.patch
similarity index 95%
rename from grep-2.27-help-align.patch
rename to grep-2.28-help-align.patch
index 9aa4011..adf4a9d 100644
--- a/grep-2.27-help-align.patch
+++ b/grep-2.28-help-align.patch
@@ -1,8 +1,8 @@
 diff --git a/src/grep.c b/src/grep.c
-index d567fcb..c4ffad2 100644
+index 8c2054b..ba67e8b 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1996,17 +1996,20 @@ Output control:\n\
+@@ -1979,17 +1979,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.27-man-fix-gs.patch b/grep-2.28-man-fix-gs.patch
similarity index 94%
rename from grep-2.27-man-fix-gs.patch
rename to grep-2.28-man-fix-gs.patch
index caa33fe..461f05b 100644
--- a/grep-2.27-man-fix-gs.patch
+++ b/grep-2.28-man-fix-gs.patch
@@ -1,5 +1,5 @@
 diff --git a/doc/grep.in.1 b/doc/grep.in.1
-index 05f3382..f83750c 100644
+index e3472f7..28709f7 100644
 --- a/doc/grep.in.1
 +++ b/doc/grep.in.1
 @@ -327,7 +327,7 @@ Print
@@ -47,10 +47,10 @@ index 05f3382..f83750c 100644
  .TP
  .BR \-a ", " \-\^\-text
 diff --git a/src/grep.c b/src/grep.c
-index 4538f22..d567fcb 100644
+index 81654c3..8c2054b 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -2020,6 +2020,8 @@ Context control:\n\
+@@ -2003,6 +2003,8 @@ Context control:\n\
  "));
        printf (_("\
    -NUM                      same as --context=NUM\n\
diff --git a/grep.spec b/grep.spec
index 6397cee..e11db34 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,7 +2,7 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.27
+Version: 2.28
 Release: 1%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/grep/
@@ -14,9 +14,9 @@ Source2: colorgrep.csh
 Source3: GREP_COLORS
 Source4: grepconf.sh
 # upstream ticket 39444
-Patch0: grep-2.27-man-fix-gs.patch
+Patch0: grep-2.28-man-fix-gs.patch
 # upstream ticket 39445
-Patch1: grep-2.27-help-align.patch
+Patch1: grep-2.28-help-align.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -86,6 +86,11 @@ fi
 %{_libexecdir}/grepconf.sh
 
 %changelog
+* Wed Feb  8 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 2.28-1
+- New version
+  Resolves: rhbz#1419921
+- De-fuzzified patches
+
 * Wed Dec  7 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.27-1
 - New version
   Resolves: rhbz#1402379
diff --git a/sources b/sources
index 9773447..0e820b8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6138dd227c39d4a25f81eea76a44d4cb  grep-2.27.tar.xz
+SHA512 (grep-2.28.tar.xz) = 7c1f054cf6a483fc43df51597b0b54df692169dbb6ff1f34918cc418786a8987e1dbeed00a5c08cc849fb74ae1c65b8e4dd9663ff1425dfb36bc636c312ad189