[arch-commits] Commit in mlocate/trunk (PKGBUILD mlocate.install updatedb.conf)

[Allan McRae]

    Date: Tuesday, June 19, 2012 @ 11:28:28
  Author: allan
Revision: 162086

upgpkg: mlocate 0.25-2

remove .install file as locate group has been in filesystem since 2008, add lots of stuff to updatedb filter list (based on Fedora)

Modified:
  mlocate/trunk/PKGBUILD
  mlocate/trunk/updatedb.conf
Deleted:
  mlocate/trunk/mlocate.install

-----------------+
 PKGBUILD        |   25 ++++++++++---------------
 mlocate.install |   18 ------------------
 updatedb.conf   |    9 ++++-----
 3 files changed, 14 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-19 15:11:44 UTC (rev 162085)
+++ PKGBUILD	2012-06-19 15:28:28 UTC (rev 162086)
@@ -4,23 +4,19 @@
 
 pkgname=mlocate
 pkgver=0.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Faster merging drop-in for slocate"
 arch=('i686' 'x86_64')
 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 @@
 
 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
 }

Deleted: mlocate.install
===================================================================
--- mlocate.install	2012-06-19 15:11:44 UTC (rev 162085)
+++ mlocate.install	2012-06-19 15:28:28 UTC (rev 162086)
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade "$1" "$1"
-  echo "mlocate command is technically locate, but slocate is symlinked and still works."
-  echo "You should run updatedb as root."
-}
-
-post_upgrade() {
-  # This can be removed after {m,x}locate have both been updated
-  getent group slocate &>/dev/null && usr/sbin/groupdel slocate &>/dev/null
-  getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null
-
-  getent group locate &>/dev/null || usr/sbin/groupadd -g 21 locate &>/dev/null
-  chown -R root:locate var/lib/mlocate
-}
-
-pre_remove() {
-  getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null
-}

Modified: updatedb.conf
===================================================================
--- updatedb.conf	2012-06-19 15:11:44 UTC (rev 162085)
+++ updatedb.conf	2012-06-19 15:28:28 UTC (rev 162086)
@@ -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"