[arch-commits] CVS update of extra/system/mlocate (5 files)

[Eric Belanger]

    Date: Monday, November 5, 2007 @ 21:21:41
  Author: eric
    Path: /home/cvs-extra/extra/system/mlocate

 Removed: PKGBUILD (1.9) mlocate.db (1.1) mlocate.install (1.3)
          updatedb.conf (1.2) updatedb.cron.daily (1.1)

mlocate is now in core. cvs cleanup and untagging


---------------------+
 PKGBUILD            |   44 --------------------------------------------
 mlocate.install     |   27 ---------------------------
 updatedb.conf       |    6 ------
 updatedb.cron.daily |   10 ----------
 4 files changed, 87 deletions(-)


Index: extra/system/mlocate/PKGBUILD
diff -u extra/system/mlocate/PKGBUILD:1.9 extra/system/mlocate/PKGBUILD:removed
--- extra/system/mlocate/PKGBUILD:1.9	Sun Sep  9 00:58:52 2007
+++ extra/system/mlocate/PKGBUILD	Mon Nov  5 21:21:41 2007
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD,v 1.9 2007/09/09 04:58:52 eric Exp $
-# Maintainer: James Rayner <iphitus at gmail.com>
-# Contributor: lydgate
-
-pkgname=mlocate
-pkgver=0.18
-pkgrel=1
-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')
-depends=('glibc')
-backup=('etc/updatedb.conf')
-install=mlocate.install
-source=(http://people.redhat.com/mitr/mlocate/mlocate-$pkgver.tar.bz2 \
-	updatedb.conf updatedb.cron.daily)
-md5sums=('c4352d10b47e569297caedd2c2d22675' '0b12d7a78c8fcbd5fea7f3c9dc55c1bd'\
-         'eee7f9db8c6145724313af6fd5fe9d66')
-
-build() {
-  cd "$startdir"/src/$pkgname-$pkgver
-
-  # Build!
-  sed -i '/^groupname /s/mlocate/locate/' Makefile.in
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-  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 Mlocate
-  make DESTDIR="$startdir"/pkg install
-
-  cd "$startdir"/pkg
-  ln -sv locate usr/bin/slocate
-  chgrp -v 21 usr/bin/locate
-  chmod -v 2755 usr/bin/locate
-
-  mkdir -pv var/lib
-  install -d -m750 -g21 var/lib/locate
-}
Index: extra/system/mlocate/mlocate.install
diff -u extra/system/mlocate/mlocate.install:1.3 extra/system/mlocate/mlocate.install:removed
--- extra/system/mlocate/mlocate.install:1.3	Sat Apr 14 10:23:16 2007
+++ extra/system/mlocate/mlocate.install	Mon Nov  5 21:21:41 2007
@@ -1,27 +0,0 @@
-# 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
-  getent group mlocate &>/dev/null && usr/sbin/groupdel mlocate &>/dev/null
-
-  getent group locate || usr/sbin/groupadd -g 21 locate &>/dev/null
-  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 $*
Index: extra/system/mlocate/updatedb.conf
diff -u extra/system/mlocate/updatedb.conf:1.2 extra/system/mlocate/updatedb.conf:removed
--- extra/system/mlocate/updatedb.conf:1.2	Tue Aug  8 04:24:51 2006
+++ extra/system/mlocate/updatedb.conf	Mon Nov  5 21:21:41 2007
@@ -1,6 +0,0 @@
-# directories to exclude from the slocate database:
-PRUNEPATHS="/tmp /var/tmp /usr/tmp /var/spool /var/cache"
-
-# filesystems to exclude from the slocate database:
-PRUNEFS="nfs smbfs ncpfs afs proc smbfs autofs auto iso9660 coda ftpfs cifs"
-
Index: extra/system/mlocate/updatedb.cron.daily
diff -u extra/system/mlocate/updatedb.cron.daily:1.1 extra/system/mlocate/updatedb.cron.daily:removed
--- extra/system/mlocate/updatedb.cron.daily:1.1	Fri Apr  7 09:19:34 2006
+++ extra/system/mlocate/updatedb.cron.daily	Mon Nov  5 21:21:41 2007
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Update the "locate" database
-if [ -x /usr/bin/updatedb ]; then
-  if [ -f /etc/updatedb.conf ]; then
-    /usr/bin/updatedb
-  else
-    /usr/bin/updatedb -f proc
-  fi
-fi