OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/findutils?expand=0&rev=10

findutils-4.4.0.diff

@@ -9,6 +9,40 @@
  used as regular expressions (with @code{find ... -regex}, so you need
  to specify these paths in the same way that @code{find} will encounter
  them.  This means for example that the paths must not include trailing
+--- find/ftsfind.c
++++ find/ftsfind.c
+@@ -388,7 +388,7 @@ consider_visiting(FTS *p, FTSENT *ent)
+ {
+   struct stat statbuf;
+   mode_t mode;
+-  int ignore, isdir;
++  int ignore;
+   
+   if (options.debug_options & DebugSearch)
+     fprintf(stderr,
+@@ -498,22 +498,6 @@ consider_visiting(FTS *p, FTSENT *ent)
+ 
+   /* examine this item. */
+   ignore = 0;
+-  isdir = S_ISDIR(statbuf.st_mode)
+-    || (FTS_D  == ent->fts_info)
+-    || (FTS_DP == ent->fts_info)
+-    || (FTS_DC == ent->fts_info);
+-
+-  if (isdir && (ent->fts_info == FTS_NSOK))
+-    {
+-      /* This is a directory, but fts did not stat it, so
+-       * presumably would not be planning to search its
+-       * children.  Force a stat of the file so that the
+-       * children can be checked.
+-       */
+-      fts_set(p, ent, FTS_AGAIN);
+-      return;
+-    }
+-
+   if (options.maxdepth >= 0)
+     {
+       if (ent->fts_level >= options.maxdepth)
 --- locate/updatedb.1
 +++ locate/updatedb.1
 @@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP.

findutils.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug  4 11:19:33 CEST 2008 - schwab@suse.de
+
+- Don't use fts.
+
 -------------------------------------------------------------------
 Tue Mar 18 10:40:04 CET 2008 - schwab@suse.de
 

findutils.spec

@@ -12,14 +12,14 @@
 
 Name:           findutils
 Url:            http://www.gnu.org/software/findutils/
-License:        GPL v2 or later
+License:        GNU Free Documentation License, Version 1.2 (GFDL 1.2); GPL v3 or later
 Group:          Productivity/File utilities
 Provides:       find 
 Obsoletes:      find 
 AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Version:        4.4.0
-Release:        1
+Release:        23
 Summary:        GNU find--Finding Files
 Source:         findutils-%{version}.tar.bz2
 Source1:        sysconfig.locate
@@ -45,6 +45,7 @@ Authors:
     Tim Wood <tim@toad.com>
 
 %package locate
+License:        GPL v3 or later
 Summary:        Tool for Locating Files (GNU Findutils Subpackage)
 Group:          Productivity/File utilities
 Provides:       findutils:/usr/bin/locate
@@ -82,6 +83,7 @@ Authors:
 	    --localstatedir=/var/lib \
 	    --infodir=%{_infodir} --mandir=%{_mandir} \
 	    --without-included-regex \
+  	    --without-fts \
 	    --enable-d_type-optimisation
 make
 
@@ -93,6 +95,7 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/suse.de-updatedb
 %find_lang %name
 rm -f $RPM_BUILD_ROOT%{_bindir}/oldfind
+rm -f $RPM_BUILD_ROOT%{_bindir}/ftsfind
 rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint*
 
 %clean
@@ -128,6 +131,8 @@ rm -rf $RPM_BUILD_ROOT
 /var/adm/fillup-templates/*
 
 %changelog
+* Mon Aug 04 2008 schwab@suse.de
+- Don't use fts.
 * Tue Mar 18 2008 schwab@suse.de
 - Update to findutils 4.4.0.
   See NEWS for details.
@@ -141,7 +146,7 @@ rm -rf $RPM_BUILD_ROOT
   The following translations have been updated:
   Hungarian, Dutch, Slovenian, Swedish, Traditional Chinese,
   Polish, Irish, Portuguese, Slovak.
-* Fri Jan 25 2008 schwab@suse.de
+* Sat Jan 26 2008 schwab@suse.de
 - Update to findutils 4.2.32.
   ** License changes
   This version of findutils is now distributed under version 3 (or
@@ -336,7 +341,7 @@ rm -rf $RPM_BUILD_ROOT
 - Cleanup selinux patch.
 * Wed Oct 15 2003 ro@suse.de
 - link libselinux static
-* Tue Oct 14 2003 kukuk@suse.de
+* Wed Oct 15 2003 kukuk@suse.de
 - Add selinux patch
 - Build not as root
 - Fix permissions in RPM filelist