[grep] New version

[Jaroslav Škarvada]

commit 712f266053ca96507558d856b1dac8b8f1372bdc
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Nov 25 11:09:35 2014 +0100

    New version
    
      Resolves: rhbz#1167657
    - De-fuzzified patches
    - Dropped pcre-backported-fixes patch (not needed)

 grep-2.20-pcre-backported-fixes.patch              |  389 --------------------
 ...-help-align.patch => grep-2.21-help-align.patch |    9 +-
 ...-man-fix-gs.patch => grep-2.21-man-fix-gs.patch |   12 +-
 grep.spec                                          |   17 +-
 sources                                            |    2 +-
 5 files changed, 22 insertions(+), 407 deletions(-)
---
diff --git a/grep-2.20-help-align.patch b/grep-2.21-help-align.patch
similarity index 92%
rename from grep-2.20-help-align.patch
rename to grep-2.21-help-align.patch
index cef6311..56f24d6 100644
--- a/grep-2.20-help-align.patch
+++ b/grep-2.21-help-align.patch
@@ -1,8 +1,8 @@
 diff --git a/src/grep.c b/src/grep.c
-index 0fcc272..2208a4e 100644
+index e3461a7..50a9868 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1579,16 +1579,19 @@ Output control:\n\
+@@ -1757,17 +1757,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\
@@ -12,11 +12,12 @@ index 0fcc272..2208a4e 100644
  "));
        printf (_("\
 -      --include=FILE_PATTERN  search only files that match FILE_PATTERN\n\
--      --exclude=FILE_PATTERN  skip files and directories matching FILE_PATTERN\n\
+-      --exclude=FILE_PATTERN  skip files and directories matching\
 +      --include=FILE_PATTERN\n\
 +                            search only files that match FILE_PATTERN\n\
 +      --exclude=FILE_PATTERN\n\
-+                            skip files and directories matching FILE_PATTERN\n\
++                            skip files and directories matching\
+  FILE_PATTERN\n\
        --exclude-from=FILE   skip files matching any file pattern from FILE\n\
 -      --exclude-dir=PATTERN  directories that match PATTERN will be skipped.\n\
 +      --exclude-dir=PATTERN directories that match PATTERN will be skipped.\n\
diff --git a/grep-2.20-man-fix-gs.patch b/grep-2.21-man-fix-gs.patch
similarity index 89%
rename from grep-2.20-man-fix-gs.patch
rename to grep-2.21-man-fix-gs.patch
index db3dd24..65f41bf 100644
--- a/grep-2.20-man-fix-gs.patch
+++ b/grep-2.21-man-fix-gs.patch
@@ -1,8 +1,8 @@
 diff --git a/doc/grep.in.1 b/doc/grep.in.1
-index 58a6c0e..3e6a8cf 100644
+index b6362ee..5a1e3ea 100644
 --- a/doc/grep.in.1
 +++ b/doc/grep.in.1
-@@ -377,7 +377,7 @@ Print
+@@ -314,7 +314,7 @@ Print
  .I NUM
  lines of trailing context after matching lines.
  Places a line containing a group separator
@@ -11,7 +11,7 @@ index 58a6c0e..3e6a8cf 100644
  between contiguous groups of matches.
  With the
  .B \-o
-@@ -390,7 +390,7 @@ Print
+@@ -327,7 +327,7 @@ Print
  .I NUM
  lines of leading context before matching lines.
  Places a line containing a group separator
@@ -20,7 +20,7 @@ index 58a6c0e..3e6a8cf 100644
  between contiguous groups of matches.
  With the
  .B \-o
-@@ -403,13 +403,24 @@ Print
+@@ -340,13 +340,24 @@ Print
  .I NUM
  lines of output context.
  Places a line containing a group separator
@@ -47,10 +47,10 @@ index 58a6c0e..3e6a8cf 100644
  .TP
  .BR \-a ", " \-\^\-text
 diff --git a/src/grep.c b/src/grep.c
-index 7c0f8a8..0fcc272 100644
+index 8dbf86e..e3461a7 100644
 --- a/src/grep.c
 +++ b/src/grep.c
-@@ -1602,6 +1602,8 @@ Context control:\n\
+@@ -1781,6 +1781,8 @@ Context control:\n\
  "));
        printf (_("\
    -NUM                      same as --context=NUM\n\
diff --git a/grep.spec b/grep.spec
index f76f13b..a5258ee 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,8 +2,8 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.20
-Release: 7%{?dist}
+Version: 2.21
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
@@ -12,11 +12,9 @@ Source2: colorgrep.csh
 Source3: GREP_COLORS
 Source4: grepconf.sh
 # upstream ticket 39444
-Patch0: grep-2.20-man-fix-gs.patch
+Patch0: grep-2.21-man-fix-gs.patch
 # upstream ticket 39445
-Patch1: grep-2.20-help-align.patch
-# backported from upstream
-Patch2: grep-2.20-pcre-backported-fixes.patch
+Patch1: grep-2.21-help-align.patch
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -37,7 +35,6 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
 %setup -q
 %patch0 -p1 -b .man-fix-gs
 %patch1 -p1 -b .help-align
-%patch2 -p1 -b .pcre-backported-fixes
 
 %build
 %global BUILD_FLAGS $RPM_OPT_FLAGS
@@ -93,6 +90,12 @@ fi
 %{_libexecdir}/grepconf.sh
 
 %changelog
+* Tue Nov 25 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.21-1
+- New version
+  Resolves: rhbz#1167657
+- De-fuzzified patches
+- Dropped pcre-backported-fixes patch (not needed)
+
 * Fri Nov 14 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 2.20-7
 - Backported more PCRE fixes (by pcre-backported-fixes patch)
 - Dropped pcre-invalid-utf8-fix patch, handled by pcre-backported-fixes patch
diff --git a/sources b/sources
index fe1f529..d9d5863 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2cbea44a4f1548aee20b9ff2d3076908  grep-2.20.tar.xz
+43c48064d6409862b8a850db83c8038a  grep-2.21.tar.xz