From a49c3c92f4f97e9ed1dc2851c7833e813cd3d6db Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Fri, 12 Feb 2010 10:57:55 +0000
Subject: [PATCH] cleanup in patches, fixed #562043

---
 findutils-4.4.0-no-locate.patch | 12 ++++++++++++
 findutils-4.4.2-selinux.patch   | 16 ++++------------
 findutils-4.4.2-xautofs.patch   |  4 ++--
 findutils.spec                  | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/findutils-4.4.0-no-locate.patch b/findutils-4.4.0-no-locate.patch
index a04310a..949e352 100644
--- a/findutils-4.4.0-no-locate.patch
+++ b/findutils-4.4.0-no-locate.patch
@@ -10,3 +10,15 @@ diff -up findutils-4.4.2/Makefile.am_old findutils-4.4.2/Makefile.am
  
  ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
  
+diff --git a/doc/find.texi b/doc/find.texi
+index 8944096..4d71066 100644
+--- a/doc/find.texi
++++ b/doc/find.texi
+@@ -7,7 +7,6 @@
+ @c %**end of header
+ 
+ @include version.texi
+-@include ../locate/dblocation.texi
+ 
+ @iftex
+ @finalout
diff --git a/findutils-4.4.2-selinux.patch b/findutils-4.4.2-selinux.patch
index 8537105..559aef1 100644
--- a/findutils-4.4.2-selinux.patch
+++ b/findutils-4.4.2-selinux.patch
@@ -15,18 +15,10 @@ index d00862f..6b8b725 100644
  
  ** Bug Fixes
 diff --git a/doc/find.texi b/doc/find.texi
-index 8944096..4d71066 100644
+index 8037c63..4d71066 100644
 --- a/doc/find.texi
 +++ b/doc/find.texi
-@@ -7,7 +7,6 @@
- @c %**end of header
- 
- @include version.texi
--@include ../locate/dblocation.texi
- 
- @iftex
- @finalout
-@@ -1242,6 +1241,14 @@ situation.
+@@ -1241,6 +1241,14 @@ situation.
  
  @end deffn
  
@@ -41,7 +33,7 @@ index 8944096..4d71066 100644
  @node Contents
  @section Contents
  
-@@ -1737,6 +1744,7 @@ from the novel you are reading.
+@@ -1736,6 +1744,7 @@ from the novel you are reading.
  * Size Directives::
  * Location Directives::
  * Time Directives::
@@ -49,7 +41,7 @@ index 8944096..4d71066 100644
  * Formatting Flags::
  @end menu
  
-@@ -1894,6 +1902,14 @@ File's last modification time in the format specified by @var{k}
+@@ -1893,6 +1902,14 @@ File's last modification time in the format specified by @var{k}
  (@pxref{Time Formats}).
  @end table
  
diff --git a/findutils-4.4.2-xautofs.patch b/findutils-4.4.2-xautofs.patch
index d37ae06..26a283e 100644
--- a/findutils-4.4.2-xautofs.patch
+++ b/findutils-4.4.2-xautofs.patch
@@ -1,8 +1,8 @@
 diff --git a/doc/find.texi b/doc/find.texi
-index 2e5958d..8944096 100644
+index f1feba3..8037c63 100644
 --- a/doc/find.texi
 +++ b/doc/find.texi
-@@ -1413,6 +1413,10 @@ them.
+@@ -1412,6 +1412,10 @@ them.
  There are two ways to avoid searching certain filesystems.  One way is
  to tell @code{find} to only search one filesystem:
  
diff --git a/findutils.spec b/findutils.spec
index 64a4b09..a81ac02 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -8,12 +8,28 @@ Group: Applications/File
 URL: http://www.gnu.org/software/findutils/
 Source0: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
 Source1: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz.sig
+
+# do not build locate
 Patch1: findutils-4.4.0-no-locate.patch
+
+# learn find to recognize autofs file system by reading /proc/mounts
+# as autofs mount points are not listed in /etc/mtab
 Patch2: findutils-4.4.2-autofs.patch
+
+# adds a new option -xautofs to find to not descend into directories on autofs file systems
 Patch3: findutils-4.4.2-xautofs.patch
+
+# patch accepted by gnulib upstream - rhbz#538536
 Patch4: findutils-4.4.2-fts-remount.patch
+
+# gnulib based SELinux patch adding a new search predicate -context and
+# a new -printf conversion %Z
 Patch5: findutils-4.4.2-selinux.patch
+
+# once the selinux-at module appears on the list within import-gnulib.config
+# the following patch will be no longer needed
 Patch6: findutils-4.4.2-selinux-gnulib.patch
+
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)