diff --git a/findutils-4.5.10-updatedb_ignore_nfsv4.patch b/findutils-4.5.10-updatedb_ignore_nfsv4.patch index b3b8a82..e9e9948 100644 --- a/findutils-4.5.10-updatedb_ignore_nfsv4.patch +++ b/findutils-4.5.10-updatedb_ignore_nfsv4.patch @@ -7,7 +7,7 @@ Index: locate/updatedb.sh PATH=/bin:/usr/bin:${BINDIR}; export PATH -: ${PRUNEFS="nfs NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"} -+: ${PRUNEFS="nfs nfsv4 NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"} ++: ${PRUNEFS="nfs nfs4 NFS proc afs smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs sysfs shfs cifs 9P unknown"} if test -n "$PRUNEFS"; then prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \ diff --git a/findutils.changes b/findutils.changes index 8807073..97454ba 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 5 11:43:21 CET 2012 - pth@suse.de + +- Fix typo in findutils-4.5.10-updatedb_ignore_nfsv4.patch that + lead to nfs4 directories being searched again (bnc#792323). +- Enable FTS based search. +- Replace $RPM_BUILD_ROOT by %%buildroot in specfile. + ------------------------------------------------------------------- Thu Nov 15 13:32:47 CET 2012 - pth@suse.de diff --git a/findutils.spec b/findutils.spec index 00a8ab8..939795a 100644 --- a/findutils.spec +++ b/findutils.spec @@ -97,7 +97,6 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)" --libexecdir=%{_libdir}/find \ --localstatedir=/var/lib \ --without-included-regex \ - --without-fts \ --enable-d_type-optimisation make %{?_smp_mflags} @@ -105,16 +104,16 @@ make %{?_smp_mflags} make check %install -make install DESTDIR=$RPM_BUILD_ROOT -install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.locate -install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/suse-updatedb -rm -f $RPM_BUILD_ROOT%{_bindir}/oldfind -rm -f $RPM_BUILD_ROOT%{_bindir}/ftsfind -rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint* +%make_install +install -D -m 644 %{SOURCE1} %{buildroot}/var/adm/fillup-templates/sysconfig.locate +install -D -m 755 %{SOURCE2} %{buildroot}/etc/cron.daily/suse-updatedb +rm -f %{buildroot}%{_bindir}/oldfind +rm -f %{buildroot}%{_bindir}/ftsfind +rm -f %{buildroot}%{_infodir}/find-maint* %find_lang %{name} #UsrMerge -mkdir -p $RPM_BUILD_ROOT/bin -ln -sf %{_bindir}/find $RPM_BUILD_ROOT/bin +mkdir -p %{buildroot}/bin +ln -sf %{_bindir}/find %{buildroot}/bin #UsrMerge %post locate