Author: glen Date: Thu Mar 25 15:55:12 2010 GMT Module: packages Tag: HEAD ---- Log message: - add cron support based on fc files
---- Files affected: packages/mlocate: mlocate.spec (1.10 -> 1.11) , mlocate.cron (NONE -> 1.1) (NEW), updatedb.conf (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mlocate/mlocate.spec diff -u packages/mlocate/mlocate.spec:1.10 packages/mlocate/mlocate.spec:1.11 --- packages/mlocate/mlocate.spec:1.10 Thu Mar 25 16:44:44 2010 +++ packages/mlocate/mlocate.spec Thu Mar 25 16:55:07 2010 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# TODO -# - cron Summary: A locate/updatedb implementation Summary(pl.UTF-8): Implementacja locate/updatedb Name: mlocate @@ -10,12 +8,15 @@ Group: Applications/System Source0: https://fedorahosted.org/releases/m/l/mlocate/%{name}-%{version}.tar.xz # Source0-md5: eb09c57c25ab98b74cbd45234f3f7851 +Source1: updatedb.conf +Source2: %{name}.cron URL: https://fedorahosted.org/mlocate/ BuildRequires: rpmbuild(macros) >= 1.228 BuildRequires: tar >= 1:1.22 Requires(postun): /usr/sbin/groupdel Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd +Requires: crondaemon Provides: group(mlocate) Provides: locate-utility Obsoletes: locate-utility @@ -48,39 +49,47 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/var/lib/mlocate +install -d $RPM_BUILD_ROOT/var/lib/%{name} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/cron.daily} +install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/updatedb.conf +install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/%{name}.cron +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/%{name}.db + %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %pre -%groupadd -g 196 mlocate +%groupadd -g 196 %{name} %post -if [ ! -f /var/lib/mlocate/mlocate.db ]; then - echo 'Run "%{_bindir}/updatedb" if you want to make mlocate database immediately.' +if [ ! -f %{_localstatedir}/lib/%{name}/%{name}.db ]; then + echo 'Run "%{_bindir}/updatedb" if you want to make %{name} database immediately.' fi %postun if [ "$1" = "0" ]; then - %groupremove mlocate + %groupremove %{name} fi %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README +%attr(755,root,root) /etc/cron.daily/%{name}.cron +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/updatedb.conf %attr(2755,root,mlocate) %{_bindir}/locate %attr(755,root,root) %{_bindir}/updatedb %{_mandir}/man1/locate.1* -%{_mandir}/man5/mlocate.db.5* +%{_mandir}/man5/%{name}.db.5* %{_mandir}/man5/updatedb.conf.5* %{_mandir}/man8/updatedb.8* -%dir %attr(750,root,mlocate) /var/lib/mlocate +%dir %attr(750,root,mlocate) /var/lib/%{name} +%ghost %{_localstatedir}/lib/%{name}/%{name}.db %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -88,6 +97,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.11 2010/03/25 15:55:07 glen +- add cron support based on fc files + Revision 1.10 2010/03/25 15:44:44 glen - up to 0.22.3 ================================================================ Index: packages/mlocate/mlocate.cron diff -u /dev/null packages/mlocate/mlocate.cron:1.1 --- /dev/null Thu Mar 25 16:55:12 2010 +++ packages/mlocate/mlocate.cron Thu Mar 25 16:55:07 2010 @@ -0,0 +1,5 @@ +#!/bin/sh +nodevs=$(< /proc/filesystems awk '$1 == "nodev" { print $2 }') +renice +19 -p $$ >/dev/null 2>&1 +ionice -c2 -n7 -p $$ >/dev/null 2>&1 +/usr/bin/updatedb -f "$nodevs" ================================================================ Index: packages/mlocate/updatedb.conf diff -u /dev/null packages/mlocate/updatedb.conf:1.1 --- /dev/null Thu Mar 25 16:55:12 2010 +++ packages/mlocate/updatedb.conf Thu Mar 25 16:55:07 2010 @@ -0,0 +1,4 @@ +PRUNE_BIND_MOUNTS = "yes" +PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset debugfs devpts ecryptfs exofs fuse fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs sockfs sysfs tmpfs ubifs udf usbfs" +PRUNENAMES = ".git .hg .svn" +PRUNEPATHS = "/afs /media /net /sfs /tmp /udev /var/cache/ccache /var/spool/cups /var/spool/squid /var/tmp" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mlocate/mlocate.spec?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
