From 4789660120f9b3381dbb2eaa792fda155129780e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Thu, 2 Jan 2014 16:52:03 +0100
Subject: [PATCH] New version

  Resolves: rhbz#1047813
- De-fuzzified patches
---
 ...5-help-align.patch => grep-2.16-help-align.patch |  4 ++--
 ...5-man-fix-gs.patch => grep-2.16-man-fix-gs.patch |  6 +++---
 grep.spec                                           | 13 +++++++++----
 sources                                             |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)
 rename grep-2.15-help-align.patch => grep-2.16-help-align.patch (95%)
 rename grep-2.15-man-fix-gs.patch => grep-2.16-man-fix-gs.patch (94%)

diff --git a/grep-2.15-help-align.patch b/grep-2.16-help-align.patch
similarity index 95%
rename from grep-2.15-help-align.patch
rename to grep-2.16-help-align.patch
index e29c60e..d94d46b 100644
--- a/grep-2.15-help-align.patch
+++ b/grep-2.16-help-align.patch
@@ -1,8 +1,8 @@
 diff --git a/src/main.c b/src/main.c
-index 930c429..dd46735 100644
+index 7c1bd60..6b7a932 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -1588,16 +1588,19 @@ Output control:\n\
+@@ -1598,16 +1598,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.15-man-fix-gs.patch b/grep-2.16-man-fix-gs.patch
similarity index 94%
rename from grep-2.15-man-fix-gs.patch
rename to grep-2.16-man-fix-gs.patch
index e416cb7..2352919 100644
--- a/grep-2.15-man-fix-gs.patch
+++ b/grep-2.16-man-fix-gs.patch
@@ -1,5 +1,5 @@
 diff --git a/doc/grep.in.1 b/doc/grep.in.1
-index 3d65610..07e2d17 100644
+index d91de8c..9e8d8d2 100644
 --- a/doc/grep.in.1
 +++ b/doc/grep.in.1
 @@ -377,7 +377,7 @@ Print
@@ -47,10 +47,10 @@ index 3d65610..07e2d17 100644
  .TP
  .BR \-a ", " \-\^\-text
 diff --git a/src/main.c b/src/main.c
-index d9c7759..930c429 100644
+index 44090be..7c1bd60 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -1611,6 +1611,8 @@ Context control:\n\
+@@ -1621,6 +1621,8 @@ Context control:\n\
  "));
        printf (_("\
    -NUM                      same as --context=NUM\n\
diff --git a/grep.spec b/grep.spec
index 391ed0e..90a0fab 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,8 +2,8 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.15
-Release: 2%{?dist}
+Version: 2.16
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
@@ -11,9 +11,9 @@ Source1: colorgrep.sh
 Source2: colorgrep.csh
 Source3: GREP_COLORS
 # upstream ticket 39444
-Patch0: grep-2.15-man-fix-gs.patch
+Patch0: grep-2.16-man-fix-gs.patch
 # upstream ticket 39445
-Patch1: grep-2.15-help-align.patch
+Patch1: grep-2.16-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
+* Thu Jan  2 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.16-1
+- New version
+  Resolves: rhbz#1047813
+- De-fuzzified patches
+
 * Tue Nov 26 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.15-2
 - Removed coloring restriction for interactive shells
   Resolves: rhbz#1034631
diff --git a/sources b/sources
index 43e7eba..dc6947d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8cab8ca52bcae735af40278423c7c942  grep-2.15.tar.xz
+502350a6c8f7c2b12ee58829e760b44d  grep-2.16.tar.xz