[grep] New version

[Jaroslav Škarvada]

commit 2f5b7f86a4b0488e64941f6766cd29379d6e1540
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Feb 26 11:33:14 2014 +0100

    New version
    
      Resolves: rhbz#1070127
    - De-fuzzified patches

 ...-help-align.patch => grep-2.18-help-align.patch |    4 ++--
 ...-man-fix-gs.patch => grep-2.18-man-fix-gs.patch |    4 ++--
 grep.spec                                          |   11 ++++++++---
 sources                                            |    2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/grep-2.17-help-align.patch b/grep-2.18-help-align.patch
similarity index 95%
rename from grep-2.17-help-align.patch
rename to grep-2.18-help-align.patch
index ae0b26b..ea151ec 100644
--- a/grep-2.17-help-align.patch
+++ b/grep-2.18-help-align.patch
@@ -1,8 +1,8 @@
 diff --git a/src/main.c b/src/main.c
-index cc4ace3..e20d36c 100644
+index 9c0eaf2..07e001c 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -1596,16 +1596,19 @@ Output control:\n\
+@@ -1597,16 +1597,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.17-man-fix-gs.patch b/grep-2.18-man-fix-gs.patch
similarity index 95%
rename from grep-2.17-man-fix-gs.patch
rename to grep-2.18-man-fix-gs.patch
index 2fc9a44..757abf2 100644
--- a/grep-2.17-man-fix-gs.patch
+++ b/grep-2.18-man-fix-gs.patch
@@ -47,10 +47,10 @@ index 58a6c0e..3e6a8cf 100644
  .TP
  .BR \-a ", " \-\^\-text
 diff --git a/src/main.c b/src/main.c
-index bd20297..cc4ace3 100644
+index 56ec6b3..9c0eaf2 100644
 --- a/src/main.c
 +++ b/src/main.c
-@@ -1619,6 +1619,8 @@ Context control:\n\
+@@ -1620,6 +1620,8 @@ Context control:\n\
  "));
        printf (_("\
    -NUM                      same as --context=NUM\n\
diff --git a/grep.spec b/grep.spec
index 14f812b..b15f57f 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,7 +2,7 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.17
+Version: 2.18
 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.17-man-fix-gs.patch
+Patch0: grep-2.18-man-fix-gs.patch
 # upstream ticket 39445
-Patch1: grep-2.17-help-align.patch
+Patch1: grep-2.18-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 Feb 26 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.18-1
+- New version
+  Resolves: rhbz#1070127
+- De-fuzzified patches
+
 * Tue Feb 18 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.17-1
 - New version
   Resolves: rhbz#1066310
diff --git a/sources b/sources
index f454ee5..6bd31c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3b1f0cbf1139e76171f790665b1b41cf  grep-2.17.tar.xz
+7439f8266f50844b56cc3e2721606541  grep-2.18.tar.xz