jskarvad pushed to grep (f22). "Documented change in behaviour of recurse option (..more)"

[notifications at fedoraproject.org]

>From c143c7740bda51e8d56ccdb4878aad006e87c0df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
Date: Tue, 7 Apr 2015 11:13:12 +0200
Subject: Documented change in behaviour of recurse option

  Resolves: rhbz#1178305

diff --git a/grep-2.21-recurse-behaviour-change-doc.patch b/grep-2.21-recurse-behaviour-change-doc.patch
new file mode 100644
index 0000000..52a3550
--- /dev/null
+++ b/grep-2.21-recurse-behaviour-change-doc.patch
@@ -0,0 +1,24 @@
+diff --git a/doc/grep.in.1 b/doc/grep.in.1
+index 5a1e3ea..3f633ea 100644
+--- a/doc/grep.in.1
++++ b/doc/grep.in.1
+@@ -478,6 +478,7 @@ Search only files whose base name matches
+ .BR \-r ", " \-\^\-recursive
+ Read all files under each directory, recursively,
+ following symbolic links only if they are on the command line.
++Note that if no file operand is given, grep searches the working directory.
+ This is equivalent to the
+ .B "\-d recurse"
+ option.
+diff --git a/doc/grep.texi b/doc/grep.texi
+index da9a1be..63016bd 100644
+--- a/doc/grep.texi
++++ b/doc/grep.texi
+@@ -698,6 +698,7 @@ For each directory operand,
+ read and process all files in that directory, recursively.
+ Follow symbolic links on the command line, but skip symlinks
+ that are encountered recursively.
++Note that if no file operand is given, grep searches the working directory.
+ This is the same as the @samp{--directories=recurse} option.
+ 
+ @item -R
diff --git a/grep.spec b/grep.spec
index 3f73cba..998fa1d 100644
--- a/grep.spec
+++ b/grep.spec
@@ -3,7 +3,7 @@
 Summary: Pattern matching utilities
 Name: grep
 Version: 2.21
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
@@ -17,6 +17,9 @@ Patch0: grep-2.21-man-fix-gs.patch
 Patch1: grep-2.21-help-align.patch
 # fix buffer overrun for grep -F, rhbz#1183653
 Patch2: grep-2.21-buf-overrun-fix.patch
+# backported from upstream
+# http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c8b9364d5900a40809827aee6cc53705073278f6
+Patch3: grep-2.21-recurse-behaviour-change-doc.patch
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -38,6 +41,7 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
 %patch0 -p1 -b .man-fix-gs
 %patch1 -p1 -b .help-align
 %patch2 -p1 -b .buf-overrun-fix
+%patch3 -p1 -b .recurse-behaviour-change-doc
 
 chmod 755 tests/kwset-abuse
 
@@ -95,6 +99,10 @@ fi
 %{_libexecdir}/grepconf.sh
 
 %changelog
+* Tue Apr  7 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 2.21-5
+- Documented change in behaviour of recurse option
+  Resolves: rhbz#1178305
+
 * Sat Feb 21 2015 Till Maas <opensource at till.name> - 2.21-4
 - Rebuilt for Fedora 23 Change
   https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/grep.git/commit/?h=f22&id=c143c7740bda51e8d56ccdb4878aad006e87c0df