New version

Resolves: rhbz#1329627
- De-fuzzified patches

grep-2.25-help-align.patch

@@ -1,8 +1,8 @@
 diff --git a/src/grep.c b/src/grep.c
-index 7ffd122..6ef8a7c 100644
+index 174b422..c3ddc67 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1854,17 +1854,20 @@ Output control:\n\
+@@ -1892,17 +1892,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\

grep-2.25-man-fix-gs.patch

@@ -1,8 +1,8 @@
 diff --git a/doc/grep.in.1 b/doc/grep.in.1
-index ade11b4..6b91700 100644
+index 1a3b7d2..2181c98 100644
 --- a/doc/grep.in.1
 +++ b/doc/grep.in.1
-@@ -320,7 +320,7 @@ Print
+@@ -324,7 +324,7 @@ Print
  .I NUM
  lines of trailing context after matching lines.
  Places a line containing a group separator
@@ -11,7 +11,7 @@ index ade11b4..6b91700 100644
  between contiguous groups of matches.
  With the
  .B \-o
-@@ -333,7 +333,7 @@ Print
+@@ -337,7 +337,7 @@ Print
  .I NUM
  lines of leading context before matching lines.
  Places a line containing a group separator
@@ -20,7 +20,7 @@ index ade11b4..6b91700 100644
  between contiguous groups of matches.
  With the
  .B \-o
-@@ -346,13 +346,24 @@ Print
+@@ -350,13 +350,24 @@ Print
  .I NUM
  lines of output context.
  Places a line containing a group separator
@@ -47,10 +47,10 @@ index ade11b4..6b91700 100644
  .TP
  .BR \-a ", " \-\^\-text
 diff --git a/src/grep.c b/src/grep.c
-index 73c3651..7ffd122 100644
+index 8baca5a..174b422 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1878,6 +1878,8 @@ Context control:\n\
+@@ -1916,6 +1916,8 @@ Context control:\n\
  "));
        printf (_("\
    -NUM                      same as --context=NUM\n\

grep.spec

@@ -2,7 +2,7 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.24
+Version: 2.25
 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.23-man-fix-gs.patch
+Patch0: grep-2.25-man-fix-gs.patch
 # upstream ticket 39445
-Patch1: grep-2.23-help-align.patch
+Patch1: grep-2.25-help-align.patch
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -86,6 +86,11 @@ fi
 %{_libexecdir}/grepconf.sh
 
 %changelog
+* Fri Apr 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.25-1
+- New version
+  Resolves: rhbz#1329627
+- De-fuzzified patches
+
 * Fri Mar 11 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.24-1
 - New version
   Resolves: rhbz#1316890