rpms/grep
6
0
Fork 0
Code Issues Pull Requests Releases Activity

New version

Browse Source 
Resolves: rhbz#1047813
- De-fuzzified patches
This commit is contained in:
Jaroslav Škarvada 2014-01-02 16:52:03 +01:00
parent d1d59d992d
commit 4789660120
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grep-2.15-help-align.patch → grep-2.16-help-align.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/main.c b/src/main.c diff --git a/src/main.c b/src/main.c
index 930c429..dd46735 100644 index 7c1bd60..6b7a932 100644
--- a/src/main.c --- a/src/main.c
+++ b/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\ -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\

6
grep-2.15-man-fix-gs.patch → grep-2.16-man-fix-gs.patch
View File

@ -1,5 +1,5 @@
diff --git a/doc/grep.in.1 b/doc/grep.in.1 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 --- a/doc/grep.in.1
+++ b/doc/grep.in.1 +++ b/doc/grep.in.1
@@ -377,7 +377,7 @@ Print @@ -377,7 +377,7 @@ Print
@ -47,10 +47,10 @@ index 3d65610..07e2d17 100644
.TP .TP
.BR \-a ", " \-\^\-text .BR \-a ", " \-\^\-text
diff --git a/src/main.c b/src/main.c diff --git a/src/main.c b/src/main.c
index d9c7759..930c429 100644 index 44090be..7c1bd60 100644
--- a/src/main.c --- a/src/main.c
+++ b/src/main.c +++ b/src/main.c
@@ -1611,6 +1611,8 @@ Context control:\n\ @@ -1621,6 +1621,8 @@ Context control:\n\
")); "));
printf (_("\ printf (_("\
-NUM same as --context=NUM\n\ -NUM same as --context=NUM\n\

13
grep.spec
View File

@ -2,8 +2,8 @@
Summary: Pattern matching utilities Summary: Pattern matching utilities
Name: grep Name: grep
Version: 2.15 Version: 2.16
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Text Group: Applications/Text
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
@ -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.15-man-fix-gs.patch Patch0: grep-2.16-man-fix-gs.patch
# upstream ticket 39445 # upstream ticket 39445
Patch1: grep-2.15-help-align.patch Patch1: grep-2.16-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
* 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 * Tue Nov 26 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.15-2
- Removed coloring restriction for interactive shells - Removed coloring restriction for interactive shells
Resolves: rhbz#1034631 Resolves: rhbz#1034631

2
sources
View File

@ -1 +1 @@
8cab8ca52bcae735af40278423c7c942 grep-2.15.tar.xz 502350a6c8f7c2b12ee58829e760b44d grep-2.16.tar.xz