From 501f9e6d87537e3ce64690de1891141398823301 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Jul 03 2017 09:40:34 +0000 Subject: New version Related: rhbz#1421129 Updated patches --- diff --git a/grep-2.28-help-align.patch b/grep-2.28-help-align.patch deleted file mode 100644 index adf4a9d..0000000 --- a/grep-2.28-help-align.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/src/grep.c b/src/grep.c -index 8c2054b..ba67e8b 100644 ---- a/src/grep.c -+++ b/src/grep.c -@@ -1979,17 +1979,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\ -- -R, --dereference-recursive likewise, but follow all symlinks\n\ -+ -R, --dereference-recursive\n\ -+ likewise, but follow all symlinks\n\ - ")); - printf (_("\ -- --include=FILE_PATTERN search only files that match 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\ - --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\ - ")); - printf (_("\ -- -L, --files-without-match print only names of FILEs containing no match\n\ -+ -L, --files-without-match print only names of FILEs containing no match\n\ - -l, --files-with-matches print only names of FILEs containing matches\n\ - -c, --count print only a count of matching lines per FILE\n\ - -T, --initial-tab make tabs line up (if needed)\n\ diff --git a/grep-2.28-man-fix-gs.patch b/grep-2.28-man-fix-gs.patch deleted file mode 100644 index 461f05b..0000000 --- a/grep-2.28-man-fix-gs.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/doc/grep.in.1 b/doc/grep.in.1 -index e3472f7..28709f7 100644 ---- a/doc/grep.in.1 -+++ b/doc/grep.in.1 -@@ -327,7 +327,7 @@ Print - .I NUM - lines of trailing context after matching lines. - Places a line containing a group separator --.RB ( \-\^\- ) -+.RB "(described under " \-\^\-group\-separator ) - between contiguous groups of matches. - With the - .B \-o -@@ -340,7 +340,7 @@ Print - .I NUM - lines of leading context before matching lines. - Places a line containing a group separator --.RB ( \-\^\- ) -+.RB "(described under " \-\^\-group\-separator ) - between contiguous groups of matches. - With the - .B \-o -@@ -353,13 +353,24 @@ Print - .I NUM - lines of output context. - Places a line containing a group separator --.RB ( \-\^\- ) -+.RB "(described under " \-\^\-group\-separator ) - between contiguous groups of matches. - With the - .B \-o - or - .B \-\^\-only\-matching - option, this has no effect and a warning is given. -+.TP -+.BI \-\^\-group\-separator= SEP -+Use -+.I SEP -+as a group separator. By default -+.I SEP -+is double hyphen -+.RB ( \-\^\- ). -+.TP -+.B \-\^\-no\-group-separator -+Use empty string as a group separator. - .SS "File and Directory Selection" - .TP - .BR \-a ", " \-\^\-text -diff --git a/src/grep.c b/src/grep.c -index 81654c3..8c2054b 100644 ---- a/src/grep.c -+++ b/src/grep.c -@@ -2003,6 +2003,8 @@ Context control:\n\ - ")); - printf (_("\ - -NUM same as --context=NUM\n\ -+ --group-separator=SEP use SEP as a group separator\n\ -+ --no-group-separator use empty string as a group separator\n\ - --color[=WHEN],\n\ - --colour[=WHEN] use markers to highlight the matching strings;\n\ - WHEN is 'always', 'never', or 'auto'\n\ diff --git a/grep-3.31-help-align.patch b/grep-3.31-help-align.patch new file mode 100644 index 0000000..caf6d4c --- /dev/null +++ b/grep-3.31-help-align.patch @@ -0,0 +1,30 @@ +diff --git a/src/grep.c b/src/grep.c +index a2de03d..fd1b3a9 100644 +--- a/src/grep.c ++++ b/src/grep.c +@@ -1962,17 +1962,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\ +- -R, --dereference-recursive likewise, but follow all symlinks\n\ ++ -R, --dereference-recursive\n\ ++ likewise, but follow all symlinks\n\ + ")); + printf (_("\ +- --include=FILE_PATTERN search only files that match 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\ + --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\ + ")); + printf (_("\ +- -L, --files-without-match print only names of FILEs with no selected lines\n\ ++ -L, --files-without-match print only names of FILEs with no selected lines\n\ + -l, --files-with-matches print only names of FILEs with selected lines\n\ + -c, --count print only a count of selected lines per FILE\n\ + -T, --initial-tab make tabs line up (if needed)\n\ diff --git a/grep-3.31-man-fix-gs.patch b/grep-3.31-man-fix-gs.patch new file mode 100644 index 0000000..233270f --- /dev/null +++ b/grep-3.31-man-fix-gs.patch @@ -0,0 +1,61 @@ +diff --git a/doc/grep.in.1 b/doc/grep.in.1 +index 40c9586..a4e89eb 100644 +--- a/doc/grep.in.1 ++++ b/doc/grep.in.1 +@@ -335,7 +335,7 @@ Print + .I NUM + lines of trailing context after matching lines. + Places a line containing a group separator +-.RB ( \-\^\- ) ++.RB "(described under " \-\^\-group\-separator ) + between contiguous groups of matches. + With the + .B \-o +@@ -348,7 +348,7 @@ Print + .I NUM + lines of leading context before matching lines. + Places a line containing a group separator +-.RB ( \-\^\- ) ++.RB "(described under " \-\^\-group\-separator ) + between contiguous groups of matches. + With the + .B \-o +@@ -361,13 +361,24 @@ Print + .I NUM + lines of output context. + Places a line containing a group separator +-.RB ( \-\^\- ) ++.RB "(described under " \-\^\-group\-separator ) + between contiguous groups of matches. + With the + .B \-o + or + .B \-\^\-only\-matching + option, this has no effect and a warning is given. ++.TP ++.BI \-\^\-group\-separator= SEP ++Use ++.I SEP ++as a group separator. By default ++.I SEP ++is double hyphen ++.RB ( \-\^\- ). ++.TP ++.B \-\^\-no\-group-separator ++Use empty string as a group separator. + .SS "File and Directory Selection" + .TP + .BR \-a ", " \-\^\-text +diff --git a/src/grep.c b/src/grep.c +index 8d22aec..a2de03d 100644 +--- a/src/grep.c ++++ b/src/grep.c +@@ -1986,6 +1986,8 @@ Context control:\n\ + ")); + printf (_("\ + -NUM same as --context=NUM\n\ ++ --group-separator=SEP use SEP as a group separator\n\ ++ --no-group-separator use empty string as a group separator\n\ + --color[=WHEN],\n\ + --colour[=WHEN] use markers to highlight the matching strings;\n\ + WHEN is 'always', 'never', or 'auto'\n\ diff --git a/grep.spec b/grep.spec index 230a239..92caed4 100644 --- a/grep.spec +++ b/grep.spec @@ -2,7 +2,7 @@ Summary: Pattern matching utilities Name: grep -Version: 3.0 +Version: 3.1 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.28-man-fix-gs.patch +Patch0: grep-3.31-man-fix-gs.patch # upstream ticket 39445 -Patch1: grep-2.28-help-align.patch +Patch1: grep-3.31-help-align.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -86,6 +86,11 @@ fi %{_libexecdir}/grepconf.sh %changelog +* Mon Jul 3 2017 Jaroslav Škarvada - 3.1-1 +- New version + Related: rhbz#1421129 +- Updated patches + * Fri Feb 10 2017 Jaroslav Škarvada - 3.0-1 - New version Resolves: rhbz#1421129 diff --git a/sources b/sources index 85a07b0..d9baf39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (grep-3.0.tar.xz) = 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 +SHA512 (grep-3.1.tar.xz) = 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26