diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-30 10:11:16 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-30 10:11:16 +0200 |
| commit | c7e80d90ff5637e1be58084748ff74d0aefda9dd (patch) | |
| tree | 595803e7e17e207ccd5b5d5142124e668cba3a1f /core/mlocate | |
| parent | 38e2ca05a73307a06dc9a8d6e9e97da7fcdff4fa (diff) | |
| parent | 3025740c981e5acc29f25b400bc93046776d7008 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/python2-matplotlib/PKGBUILD
community-testing/python2-matplotlib/setup.cfg
kde-unstable/kdebindings-python/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/libusbx/PKGBUILD
testing/pyqt/PKGBUILD
Diffstat (limited to 'core/mlocate')
| -rw-r--r-- | core/mlocate/PKGBUILD | 27 | ||||
| -rw-r--r-- | core/mlocate/updatedb.conf | 9 |
2 files changed, 15 insertions, 21 deletions
diff --git a/core/mlocate/PKGBUILD b/core/mlocate/PKGBUILD index 0f2e212e0..c45a7132a 100644 --- a/core/mlocate/PKGBUILD +++ b/core/mlocate/PKGBUILD @@ -1,26 +1,22 @@ -# $Id: PKGBUILD 152305 2012-03-06 15:10:37Z allan $ +# $Id: PKGBUILD 162719 2012-06-29 02:14:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: lydgate pkgname=mlocate pkgver=0.25 -pkgrel=1 +pkgrel=2 pkgdesc="Faster merging drop-in for slocate" arch=('i686' 'x86_64' 'mips64el') url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate" license=('GPL') -conflicts=('slocate') -provides=('slocate') -replaces=('slocate') depends=('glibc' 'coreutils' 'sh') backup=('etc/updatedb.conf' 'etc/cron.daily/updatedb') -install=mlocate.install source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.xz updatedb.conf updatedb.cron.daily) md5sums=('c6d043b170613b0e327a815b497f680a' - 'c374ff223f2e07b5e602ba22359f2335' + 'b56d81de17fe29b01b4b28861acb8fd4' 'cde5da81bebad2de556ef2e43d895e13') build() { @@ -39,18 +35,17 @@ check() { package() { cd $srcdir/$pkgname-$pkgver - - # Set up a default updatedb.conf and a daily cronjob - install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf - install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb - # Install Mlocate make DESTDIR=$pkgdir install - ln -sv locate $pkgdir/usr/bin/slocate - chgrp -v 21 $pkgdir/usr/bin/locate - chmod -v 2755 $pkgdir/usr/bin/locate + ln -s locate $pkgdir/usr/bin/slocate + chgrp 21 $pkgdir/usr/bin/locate + chmod 2755 $pkgdir/usr/bin/locate install -dm755 $pkgdir/var/lib - install -d -m750 -g21 $pkgdir/var/lib/locate + install -dm750 -g21 $pkgdir/var/lib/locate + + # Set up a default updatedb.conf and a daily cronjob + install -Dm644 ${srcdir}/updatedb.conf $pkgdir/etc/updatedb.conf + install -Dm744 ${srcdir}/updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb } diff --git a/core/mlocate/updatedb.conf b/core/mlocate/updatedb.conf index 722b04205..633c17482 100644 --- a/core/mlocate/updatedb.conf +++ b/core/mlocate/updatedb.conf @@ -1,5 +1,4 @@ -# directories to exclude from the slocate database: -PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool" - -# filesystems to exclude from the slocate database: -PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts devtmpfs ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs sshfs sysfs tmpfs udf usbfs vboxsf" +PRUNE_BIND_MOUNTS = "yes" +PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset cramfs debugfs devpts devtmpfs ecryptfs exofs ftpfs fuse fuse.encfs fuse.sshfs fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs sshfs sysfs tmpfs ubifs udf usbfs vboxsf" +PRUNENAMES = ".git .hg .svn" +PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache /var/lib/pacman/local /var/lock /var/run /var/spool /var/tmp" |