New version
Resolves: rhbz#1104508 - De-fuzzified patches
This commit is contained in:
parent
6c1ddd4290
commit
629fcb0b78
@ -1,8 +1,8 @@
|
|||||||
diff --git a/src/grep.c b/src/grep.c
|
diff --git a/src/grep.c b/src/grep.c
|
||||||
index 7e07f06..3e5d6dc 100644
|
index 0fcc272..2208a4e 100644
|
||||||
--- a/src/grep.c
|
--- a/src/grep.c
|
||||||
+++ b/src/grep.c
|
+++ b/src/grep.c
|
||||||
@@ -1583,16 +1583,19 @@ Output control:\n\
|
@@ -1579,16 +1579,19 @@ Output control:\n\
|
||||||
-D, --devices=ACTION how to handle devices, FIFOs and sockets;\n\
|
-D, --devices=ACTION how to handle devices, FIFOs and sockets;\n\
|
||||||
ACTION is 'read' or 'skip'\n\
|
ACTION is 'read' or 'skip'\n\
|
||||||
-r, --recursive like --directories=recurse\n\
|
-r, --recursive like --directories=recurse\n\
|
@ -47,10 +47,10 @@ index 58a6c0e..3e6a8cf 100644
|
|||||||
.TP
|
.TP
|
||||||
.BR \-a ", " \-\^\-text
|
.BR \-a ", " \-\^\-text
|
||||||
diff --git a/src/grep.c b/src/grep.c
|
diff --git a/src/grep.c b/src/grep.c
|
||||||
index ec955d8..7e07f06 100644
|
index 7c0f8a8..0fcc272 100644
|
||||||
--- a/src/grep.c
|
--- a/src/grep.c
|
||||||
+++ b/src/grep.c
|
+++ b/src/grep.c
|
||||||
@@ -1606,6 +1606,8 @@ Context control:\n\
|
@@ -1602,6 +1602,8 @@ Context control:\n\
|
||||||
"));
|
"));
|
||||||
printf (_("\
|
printf (_("\
|
||||||
-NUM same as --context=NUM\n\
|
-NUM same as --context=NUM\n\
|
11
grep.spec
11
grep.spec
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Summary: Pattern matching utilities
|
Summary: Pattern matching utilities
|
||||||
Name: grep
|
Name: grep
|
||||||
Version: 2.19
|
Version: 2.20
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Group: Applications/Text
|
Group: Applications/Text
|
||||||
@ -11,9 +11,9 @@ Source1: colorgrep.sh
|
|||||||
Source2: colorgrep.csh
|
Source2: colorgrep.csh
|
||||||
Source3: GREP_COLORS
|
Source3: GREP_COLORS
|
||||||
# upstream ticket 39444
|
# upstream ticket 39444
|
||||||
Patch0: grep-2.19-man-fix-gs.patch
|
Patch0: grep-2.20-man-fix-gs.patch
|
||||||
# upstream ticket 39445
|
# upstream ticket 39445
|
||||||
Patch1: grep-2.19-help-align.patch
|
Patch1: grep-2.20-help-align.patch
|
||||||
URL: http://www.gnu.org/software/grep/
|
URL: http://www.gnu.org/software/grep/
|
||||||
Requires(post): /sbin/install-info
|
Requires(post): /sbin/install-info
|
||||||
Requires(preun): /sbin/install-info
|
Requires(preun): /sbin/install-info
|
||||||
@ -85,6 +85,11 @@ fi
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 4 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.20-1
|
||||||
|
- New version
|
||||||
|
Resolves: rhbz#1104508
|
||||||
|
- De-fuzzified patches
|
||||||
|
|
||||||
* Fri May 23 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.19-1
|
* Fri May 23 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.19-1
|
||||||
- New version
|
- New version
|
||||||
Resolves: rhbz#1100653
|
Resolves: rhbz#1100653
|
||||||
|
Loading…
Reference in New Issue
Block a user