rpms/findutils/F-13 findutils-4.4.2-xautofs.patch, 1.3, 1.4 findutils.spec, 1.71, 1.72

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/findutils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14139

Modified Files:
	findutils-4.4.2-xautofs.patch findutils.spec 
Log Message:
- mention -xautofs in the output of --help (#590166)

findutils-4.4.2-xautofs.patch:
 doc/find.texi  |    4 ++++
 find/defs.h    |    3 +++
 find/find.1    |    3 +++
 find/ftsfind.c |    6 ++++++
 find/parser.c  |   11 ++++++++++-
 find/util.c    |    1 +
 6 files changed, 27 insertions(+), 1 deletion(-)

Index: findutils-4.4.2-xautofs.patch
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-13/findutils-4.4.2-xautofs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- findutils-4.4.2-xautofs.patch	12 Feb 2010 10:57:54 -0000	1.3
+++ findutils-4.4.2-xautofs.patch	10 May 2010 15:17:21 -0000	1.4
@@ -1,3 +1,11 @@
+ doc/find.texi  |    4 ++++
+ find/defs.h    |    3 +++
+ find/find.1    |    3 +++
+ find/ftsfind.c |    6 ++++++
+ find/parser.c  |   11 ++++++++++-
+ find/util.c    |    1 +
+ 6 files changed, 27 insertions(+), 1 deletions(-)
+
 diff --git a/doc/find.texi b/doc/find.texi
 index f1feba3..8037c63 100644
 --- a/doc/find.texi
@@ -59,7 +67,7 @@ index b59d896..838b81f 100644
      {
        /* this is the preorder visit, but user said -depth */ 
 diff --git a/find/parser.c b/find/parser.c
-index 534b670..036ddb8 100644
+index 534b670..411fd96 100644
 --- a/find/parser.c
 +++ b/find/parser.c
 @@ -150,6 +150,7 @@ static boolean parse_user          PARAMS((const struct parser_table*, char *arg
@@ -78,17 +86,23 @@ index 534b670..036ddb8 100644
    PARSE_TEST       ("xtype",                 xtype),	     /* GNU */
  #ifdef UNIMPLEMENTED_UNIX
    /* It's pretty ugly for find to know about archive formats.
-@@ -2560,6 +2562,16 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
+@@ -1117,7 +1119,7 @@ operators (decreasing precedence; -and is implicit where no others are given):\n
+ positional options (always true): -daystart -follow -regextype\n\n\
+ normal options (always true, specified before other expressions):\n\
+       -depth --help -maxdepth LEVELS -mindepth LEVELS -mount -noleaf\n\
+-      --version -xdev -ignore_readdir_race -noignore_readdir_race\n"));
++      --version -xautofs -xdev -ignore_readdir_race -noignore_readdir_race\n"));
+   puts (_("\
+ tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\
+       -cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\
+@@ -2560,6 +2562,13 @@ parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr)
  }
  
  static boolean
 +parse_xautofs (const struct parser_table* entry, char **argv, int *arg_ptr)
 +{
-+  (void) argv;
-+  (void) arg_ptr;
-+  (void) entry;
 +  options.bypass_autofs = true;
-+  return true;
++  return parse_noop(entry, argv, arg_ptr);
 +}
 +
 +static boolean


Index: findutils.spec
===================================================================
RCS file: /cvs/extras/rpms/findutils/F-13/findutils.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- findutils.spec	6 May 2010 13:13:26 -0000	1.71
+++ findutils.spec	10 May 2010 15:17:21 -0000	1.72
@@ -133,8 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/find-maint.info.gz
 
 %changelog
-* Thu May 06 2010 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-7
+* Mon May 10 2010 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-7
 - backport of patches for upstream bugs #19593 and #27563 (rhbz #493143)
+- mention -xautofs in the output of --help (#590166)
 
 * Thu Nov 26 2009 Kamil Dudka <kdudka at redhat.com> - 1:4.4.2-6
 - update SELinux patch to the latest upstream (gnulib based) version