From 629fcb0b78a2d8205ffee7df3baafa548e364844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Wed, 4 Jun 2014 17:04:01 +0200
Subject: [PATCH] New version

  Resolves: rhbz#1104508
- De-fuzzified patches
---
 ....19-help-align.patch => grep-2.20-help-align.patch |  4 ++--
 ....19-man-fix-gs.patch => grep-2.20-man-fix-gs.patch |  4 ++--
 grep.spec                                             | 11 ++++++++---
 sources                                               |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)
 rename grep-2.19-help-align.patch => grep-2.20-help-align.patch (95%)
 rename grep-2.19-man-fix-gs.patch => grep-2.20-man-fix-gs.patch (95%)

diff --git a/grep-2.19-help-align.patch b/grep-2.20-help-align.patch
similarity index 95%
rename from grep-2.19-help-align.patch
rename to grep-2.20-help-align.patch
index 40d15fe..cef6311 100644
--- a/grep-2.19-help-align.patch
+++ b/grep-2.20-help-align.patch
@@ -1,8 +1,8 @@
 diff --git a/src/grep.c b/src/grep.c
-index 7e07f06..3e5d6dc 100644
+index 0fcc272..2208a4e 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1583,16 +1583,19 @@ Output control:\n\
+@@ -1579,16 +1579,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.19-man-fix-gs.patch b/grep-2.20-man-fix-gs.patch
similarity index 95%
rename from grep-2.19-man-fix-gs.patch
rename to grep-2.20-man-fix-gs.patch
index 0c373df..db3dd24 100644
--- a/grep-2.19-man-fix-gs.patch
+++ b/grep-2.20-man-fix-gs.patch
@@ -47,10 +47,10 @@ index 58a6c0e..3e6a8cf 100644
  .TP
  .BR \-a ", " \-\^\-text
 diff --git a/src/grep.c b/src/grep.c
-index ec955d8..7e07f06 100644
+index 7c0f8a8..0fcc272 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1606,6 +1606,8 @@ Context control:\n\
+@@ -1602,6 +1602,8 @@ Context control:\n\
  "));
        printf (_("\
    -NUM                      same as --context=NUM\n\
diff --git a/grep.spec b/grep.spec
index a789abc..5e0d336 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,7 +2,7 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.19
+Version: 2.20
 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.19-man-fix-gs.patch
+Patch0: grep-2.20-man-fix-gs.patch
 # upstream ticket 39445
-Patch1: grep-2.19-help-align.patch
+Patch1: grep-2.20-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
+* Wed Jun  4 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.20-1
+- New version
+  Resolves: rhbz#1104508
+- De-fuzzified patches
+
 * Fri May 23 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.19-1
 - New version
   Resolves: rhbz#1100653
diff --git a/sources b/sources
index e76df62..fe1f529 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac732142227d9fe9567d71301e127979  grep-2.19.tar.xz
+2cbea44a4f1548aee20b9ff2d3076908  grep-2.20.tar.xz