From b214cc9e3ccc763216cbd6e04ffcf84629f19b01 Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Oct 03 2012 08:33:13 +0000 Subject: Fixed -R option placement --- diff --git a/grep-2.14-man-fix-R.patch b/grep-2.14-man-fix-R.patch new file mode 100644 index 0000000..7f04ae3 --- /dev/null +++ b/grep-2.14-man-fix-R.patch @@ -0,0 +1,12 @@ +diff --git a/doc/grep.in.1 b/doc/grep.in.1 +index 4bf03b4..f2d4362 100644 +--- a/doc/grep.in.1 ++++ b/doc/grep.in.1 +@@ -533,6 +533,7 @@ following symbolic links only if they are on the command line. + This is equivalent to the + .B "\-d recurse" + option. ++.TP + .BR \-R ", " \-\^\-dereference\-recursive + Read all files under each directory, recursively. + Follow all symbolic links, unlike diff --git a/grep.spec b/grep.spec index 0702099..2026432 100644 --- a/grep.spec +++ b/grep.spec @@ -3,7 +3,7 @@ Summary: Pattern matching utilities Name: grep Version: 2.14 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/Text Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz @@ -11,6 +11,7 @@ Source1: colorgrep.sh Source2: colorgrep.csh Source3: GREP_COLORS Patch1: grep-2.11-gnulib-tests-rm-f.patch +Patch2: grep-2.14-man-fix-R.patch URL: http://www.gnu.org/software/grep/ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -30,6 +31,7 @@ GNU grep is needed by many scripts, so it shall be installed on every system. %prep %setup -q %patch1 -p1 -b .gnulib-tests-rm-f +%patch2 -p1 -b .man-fix-R %build %global BUILD_FLAGS $RPM_OPT_FLAGS @@ -81,6 +83,9 @@ fi %{_mandir}/*/* %changelog +* Wed Oct 3 2012 Jaroslav Škarvada - 2.14-2 +- Fixed -R option placement + * Mon Aug 20 2012 Jaroslav Škarvada - 2.14-1 - New version Resolves: rhbz#849594