New version
Resolves: rhbz#1381203
This commit is contained in:
parent
35d524dfdb
commit
94556aeb63
@ -1,8 +1,8 @@
|
||||
diff --git a/src/grep.c b/src/grep.c
|
||||
index 174b422..c3ddc67 100644
|
||||
index e85d52e..6154a72 100644
|
||||
--- a/src/grep.c
|
||||
+++ b/src/grep.c
|
||||
@@ -1892,17 +1892,20 @@ Output control:\n\
|
||||
@@ -1954,17 +1954,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\
|
@ -1,8 +1,8 @@
|
||||
diff --git a/doc/grep.in.1 b/doc/grep.in.1
|
||||
index 1a3b7d2..2181c98 100644
|
||||
index 05f3382..f83750c 100644
|
||||
--- a/doc/grep.in.1
|
||||
+++ b/doc/grep.in.1
|
||||
@@ -324,7 +324,7 @@ Print
|
||||
@@ -327,7 +327,7 @@ Print
|
||||
.I NUM
|
||||
lines of trailing context after matching lines.
|
||||
Places a line containing a group separator
|
||||
@ -11,7 +11,7 @@ index 1a3b7d2..2181c98 100644
|
||||
between contiguous groups of matches.
|
||||
With the
|
||||
.B \-o
|
||||
@@ -337,7 +337,7 @@ Print
|
||||
@@ -340,7 +340,7 @@ Print
|
||||
.I NUM
|
||||
lines of leading context before matching lines.
|
||||
Places a line containing a group separator
|
||||
@ -20,7 +20,7 @@ index 1a3b7d2..2181c98 100644
|
||||
between contiguous groups of matches.
|
||||
With the
|
||||
.B \-o
|
||||
@@ -350,13 +350,24 @@ Print
|
||||
@@ -353,13 +353,24 @@ Print
|
||||
.I NUM
|
||||
lines of output context.
|
||||
Places a line containing a group separator
|
||||
@ -47,10 +47,10 @@ index 1a3b7d2..2181c98 100644
|
||||
.TP
|
||||
.BR \-a ", " \-\^\-text
|
||||
diff --git a/src/grep.c b/src/grep.c
|
||||
index 8baca5a..174b422 100644
|
||||
index 3b85561..e85d52e 100644
|
||||
--- a/src/grep.c
|
||||
+++ b/src/grep.c
|
||||
@@ -1916,6 +1916,8 @@ Context control:\n\
|
||||
@@ -1978,6 +1978,8 @@ Context control:\n\
|
||||
"));
|
||||
printf (_("\
|
||||
-NUM same as --context=NUM\n\
|
10
grep.spec
10
grep.spec
@ -2,7 +2,7 @@
|
||||
|
||||
Summary: Pattern matching utilities
|
||||
Name: grep
|
||||
Version: 2.25
|
||||
Version: 2.26
|
||||
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.25-man-fix-gs.patch
|
||||
Patch0: grep-2.26-man-fix-gs.patch
|
||||
# upstream ticket 39445
|
||||
Patch1: grep-2.25-help-align.patch
|
||||
Patch1: grep-2.26-help-align.patch
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
|
||||
@ -86,6 +86,10 @@ fi
|
||||
%{_libexecdir}/grepconf.sh
|
||||
|
||||
%changelog
|
||||
* Mon Oct 3 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.26-1
|
||||
- New version
|
||||
Resolves: rhbz#1381203
|
||||
|
||||
* Fri Apr 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.25-1
|
||||
- New version
|
||||
Resolves: rhbz#1329627
|
||||
|
Loading…
Reference in New Issue
Block a user