pool/findutils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 145207 from Base:System

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/145207
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/findutils?expand=0&rev=39
This commit is contained in:
Stephan Kulow 2012-12-14 05:39:46 +00:00 committed by Git OBS Bridge
commit 16487ed2d0
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
findutils-4.5.10-updatedb_ignore_nfsv4.patch
View File

@ -7,7 +7,7 @@ Index: locate/updatedb.sh
PATH=/bin:/usr/bin:${BINDIR}; export PATH 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 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 if test -n "$PRUNEFS"; then
prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \ prunefs_exp=`echo $PRUNEFS |sed -e 's/\([^ ][^ ]*\)/-o -fstype \1/g' \

8
findutils.changes
View File

@ -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 Thu Nov 15 13:32:47 CET 2012 - pth@suse.de

17
findutils.spec
View File

@ -97,7 +97,6 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
--libexecdir=%{_libdir}/find \ --libexecdir=%{_libdir}/find \
--localstatedir=/var/lib \ --localstatedir=/var/lib \
--without-included-regex \ --without-included-regex \
--without-fts \
--enable-d_type-optimisation --enable-d_type-optimisation
make %{?_smp_mflags} make %{?_smp_mflags}
@ -105,16 +104,16 @@ make %{?_smp_mflags}
make check make check
%install %install
make install DESTDIR=$RPM_BUILD_ROOT %make_install
install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.locate install -D -m 644 %{SOURCE1} %{buildroot}/var/adm/fillup-templates/sysconfig.locate
install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/suse-updatedb install -D -m 755 %{SOURCE2} %{buildroot}/etc/cron.daily/suse-updatedb
rm -f $RPM_BUILD_ROOT%{_bindir}/oldfind rm -f %{buildroot}%{_bindir}/oldfind
rm -f $RPM_BUILD_ROOT%{_bindir}/ftsfind rm -f %{buildroot}%{_bindir}/ftsfind
rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint* rm -f %{buildroot}%{_infodir}/find-maint*
%find_lang %{name} %find_lang %{name}
#UsrMerge #UsrMerge
mkdir -p $RPM_BUILD_ROOT/bin mkdir -p %{buildroot}/bin
ln -sf %{_bindir}/find $RPM_BUILD_ROOT/bin ln -sf %{_bindir}/find %{buildroot}/bin
#UsrMerge #UsrMerge
%post locate %post locate