[arch-commits] Commit in mlocate/trunk (4 files)

[Allan McRae]

    Date: Saturday, August 1, 2009 @ 05:39:57
  Author: allan
Revision: 48252

upgpkg: mlocate 0.22-2
    add more excludes to /etc/updatedb.conf (FS#14714), add /etc/crond.daily/updatedb to backup array so people can do things like FS#14484 and FS#15614, add sh dep for cron job

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

-----------------+
 PKGBUILD        |   47 ++++++++++++++++++++++++-----------------------
 mlocate.install |    9 ---------
 updatedb.conf   |    4 ++--
 3 files changed, 26 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-01 08:35:51 UTC (rev 48251)
+++ PKGBUILD	2009-08-01 09:39:57 UTC (rev 48252)
@@ -1,25 +1,31 @@
 # $Id$
-# Maintainer: James Rayner <iphitus at gmail.com>
+# Maintainer: Allan McRae <allan at archlinux.org>
 # Contributor: lydgate
 
 pkgname=mlocate
 pkgver=0.22
-pkgrel=1
+pkgrel=2
 pkgdesc="Faster merging drop-in for slocate"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate"
-license=("GPL")
-groups=("base")
+license=('GPL')
+groups=('base')
 conflicts=('slocate')
 provides=('slocate')
 replaces=('slocate')
-depends=('glibc')
-backup=('etc/updatedb.conf')
+depends=('glibc' 'sh')
+backup=('etc/updatedb.conf'
+        'etc/cron.daily/updatedb')
 install=mlocate.install
-source=("https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.bz2" \
-	updatedb.conf updatedb.cron.daily)
+source=(https://fedorahosted.org/releases/m/l/mlocate/mlocate-$pkgver.tar.bz2
+	updatedb.conf
+	updatedb.cron.daily)
+md5sums=('ffd78b6ff967a8ae9f4780f6a9a95e68'
+         '66898efb290eff4efd44a0b94fe3927d'
+         'eee7f9db8c6145724313af6fd5fe9d66')
+
 build() {
-  cd "$startdir"/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
 
   # Build!
   sed -i '/^groupname /s/mlocate/locate/' Makefile.in
@@ -27,21 +33,16 @@
   make || return 1
 
   # Set up a default updatedb.conf and a daily cronjob
-  install -v -D -m644 ../updatedb.conf "$startdir"/pkg/etc/updatedb.conf
-  install -v -D -m744 ../updatedb.cron.daily "$startdir"/pkg/etc/cron.daily/updatedb
+  install -Dm644 ../updatedb.conf $pkgdir/etc/updatedb.conf
+  install -Dm744 ../updatedb.cron.daily $pkgdir/etc/cron.daily/updatedb
 
   # Install Mlocate
-  make DESTDIR="$startdir"/pkg install
+  make DESTDIR=$pkgdir install
 
-  cd "$startdir"/pkg
-  ln -sv locate usr/bin/slocate
-  chgrp -v 21 usr/bin/locate
-  chmod -v 2755 usr/bin/locate
+  ln -sv locate $pkgdir/usr/bin/slocate
+  chgrp -v 21 $pkgdir/usr/bin/locate
+  chmod -v 2755 $pkgdir/usr/bin/locate
 
-  mkdir -pv var/lib
-  install -d -m750 -g21 var/lib/locate
+  install -dm755 $pkgdir/var/lib
+  install -d -m750 -g21 $pkgdir/var/lib/locate
 }
-
-md5sums=('ffd78b6ff967a8ae9f4780f6a9a95e68'
-         '08f642828fe8a6a0c8e5059133c9a9e2'
-         'eee7f9db8c6145724313af6fd5fe9d66')

Modified: mlocate.install
===================================================================
--- mlocate.install	2009-08-01 08:35:51 UTC (rev 48251)
+++ mlocate.install	2009-08-01 09:39:57 UTC (rev 48252)
@@ -1,12 +1,9 @@
-# arg 1:  the new package version
 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."
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 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
@@ -16,12 +13,6 @@
   chown -R root:locate var/lib/mlocate
 }
 
-# arg 1:  the old package version
 pre_remove() {
   getent group locate &>/dev/null && usr/sbin/groupdel locate &>/dev/null
 }
-
-op=$1
-shift
-
-$op $*

Modified: updatedb.conf
===================================================================
--- updatedb.conf	2009-08-01 08:35:51 UTC (rev 48251)
+++ updatedb.conf	2009-08-01 09:39:57 UTC (rev 48252)
@@ -1,5 +1,5 @@
 # directories to exclude from the slocate database:
-PRUNEPATHS="/tmp /var/tmp /usr/tmp /var/spool /var/cache"
+PRUNEPATHS="/media /mnt /tmp /var/tmp /var/cache /var/lock /var/run /var/spool"
 
 # filesystems to exclude from the slocate database:
-PRUNEFS="nfs nfs4 smbfs cifs ncpfs afs proc autofs auto iso9660 coda ftpfs sshfs shfs"
+PRUNEFS="afs auto autofs binfmt_misc cifs coda configfs cramfs debugfs devpts ftpfs iso9660 mqueue ncpfs nfs nfs4 proc ramfs securityfs shfs smbfs sshfs sysfs tmpfs udf usbfs"