New version
Resolves: rhbz#1047813 - De-fuzzified patches
This commit is contained in:
parent
d1d59d992d
commit
4789660120
@ -1,8 +1,8 @@
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 930c429..dd46735 100644
|
||||
index 7c1bd60..6b7a932 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -1588,16 +1588,19 @@ Output control:\n\
|
||||
@@ -1598,16 +1598,19 @@ 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,5 +1,5 @@
|
||||
diff --git a/doc/grep.in.1 b/doc/grep.in.1
|
||||
index 3d65610..07e2d17 100644
|
||||
index d91de8c..9e8d8d2 100644
|
||||
--- a/doc/grep.in.1
|
||||
+++ b/doc/grep.in.1
|
||||
@@ -377,7 +377,7 @@ Print
|
||||
@ -47,10 +47,10 @@ index 3d65610..07e2d17 100644
|
||||
.TP
|
||||
.BR \-a ", " \-\^\-text
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index d9c7759..930c429 100644
|
||||
index 44090be..7c1bd60 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -1611,6 +1611,8 @@ Context control:\n\
|
||||
@@ -1621,6 +1621,8 @@ Context control:\n\
|
||||
"));
|
||||
printf (_("\
|
||||
-NUM same as --context=NUM\n\
|
13
grep.spec
13
grep.spec
@ -2,8 +2,8 @@
|
||||
|
||||
Summary: Pattern matching utilities
|
||||
Name: grep
|
||||
Version: 2.15
|
||||
Release: 2%{?dist}
|
||||
Version: 2.16
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/Text
|
||||
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
|
||||
@ -11,9 +11,9 @@ Source1: colorgrep.sh
|
||||
Source2: colorgrep.csh
|
||||
Source3: GREP_COLORS
|
||||
# upstream ticket 39444
|
||||
Patch0: grep-2.15-man-fix-gs.patch
|
||||
Patch0: grep-2.16-man-fix-gs.patch
|
||||
# upstream ticket 39445
|
||||
Patch1: grep-2.15-help-align.patch
|
||||
Patch1: grep-2.16-help-align.patch
|
||||
URL: http://www.gnu.org/software/grep/
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
@ -85,6 +85,11 @@ fi
|
||||
%{_mandir}/*/*
|
||||
|
||||
%changelog
|
||||
* Thu Jan 2 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.16-1
|
||||
- New version
|
||||
Resolves: rhbz#1047813
|
||||
- De-fuzzified patches
|
||||
|
||||
* Tue Nov 26 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.15-2
|
||||
- Removed coloring restriction for interactive shells
|
||||
Resolves: rhbz#1034631
|
||||
|
Loading…
Reference in New Issue
Block a user