[arch-commits] Commit in mlocate/repos (9 files)

Allan McRae allan at archlinux.org
Tue Mar 6 10:10:37 EST 2012


    Date: Tuesday, March 6, 2012 @ 10:10:37
  Author: allan
Revision: 152305

db-move: moved mlocate from [testing] to [core] (x86_64)

Added:
  mlocate/repos/core-x86_64/PKGBUILD
    (from rev 152303, mlocate/repos/testing-x86_64/PKGBUILD)
  mlocate/repos/core-x86_64/mlocate.install
    (from rev 152303, mlocate/repos/testing-x86_64/mlocate.install)
  mlocate/repos/core-x86_64/updatedb.conf
    (from rev 152303, mlocate/repos/testing-x86_64/updatedb.conf)
  mlocate/repos/core-x86_64/updatedb.cron.daily
    (from rev 152303, mlocate/repos/testing-x86_64/updatedb.cron.daily)
Deleted:
  mlocate/repos/core-x86_64/PKGBUILD
  mlocate/repos/core-x86_64/mlocate.install
  mlocate/repos/core-x86_64/updatedb.conf
  mlocate/repos/core-x86_64/updatedb.cron.daily
  mlocate/repos/testing-x86_64/

---------------------+
 PKGBUILD            |  112 +++++++++++++++++++++++++-------------------------
 mlocate.install     |   36 ++++++++--------
 updatedb.conf       |   10 ++--
 updatedb.cron.daily |   58 ++++++++++++-------------
 4 files changed, 108 insertions(+), 108 deletions(-)

Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD	2012-03-06 15:10:36 UTC (rev 152304)
+++ core-x86_64/PKGBUILD	2012-03-06 15:10:37 UTC (rev 152305)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
-# Contributor: lydgate
-
-pkgname=mlocate
-pkgver=0.24
-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=('a9c221e5bc489a2ed710c943990137bd'
-         'c374ff223f2e07b5e602ba22359f2335'
-         'cde5da81bebad2de556ef2e43d895e13')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  sed -i '/^groupname /s/mlocate/locate/' Makefile.in
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-  make
-
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make 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
-
-  install -dm755 $pkgdir/var/lib
-  install -d -m750 -g21 $pkgdir/var/lib/locate
-}

Copied: mlocate/repos/core-x86_64/PKGBUILD (from rev 152303, mlocate/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD	                        (rev 0)
+++ core-x86_64/PKGBUILD	2012-03-06 15:10:37 UTC (rev 152305)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: lydgate
+
+pkgname=mlocate
+pkgver=0.25
+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')
+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'
+         'cde5da81bebad2de556ef2e43d895e13')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+
+  sed -i '/^groupname /s/mlocate/locate/' Makefile.in
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
+  make
+
+}
+
+check() {
+  cd $srcdir/$pkgname-$pkgver
+  make 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
+
+  install -dm755 $pkgdir/var/lib
+  install -d -m750 -g21 $pkgdir/var/lib/locate
+}

Deleted: core-x86_64/mlocate.install
===================================================================
--- core-x86_64/mlocate.install	2012-03-06 15:10:36 UTC (rev 152304)
+++ core-x86_64/mlocate.install	2012-03-06 15:10:37 UTC (rev 152305)
@@ -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
-}

Copied: mlocate/repos/core-x86_64/mlocate.install (from rev 152303, mlocate/repos/testing-x86_64/mlocate.install)
===================================================================
--- core-x86_64/mlocate.install	                        (rev 0)
+++ core-x86_64/mlocate.install	2012-03-06 15:10:37 UTC (rev 152305)
@@ -0,0 +1,18 @@
+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
+}

Deleted: core-x86_64/updatedb.conf
===================================================================
--- core-x86_64/updatedb.conf	2012-03-06 15:10:36 UTC (rev 152304)
+++ core-x86_64/updatedb.conf	2012-03-06 15:10:37 UTC (rev 152305)
@@ -1,5 +0,0 @@
-# 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"

Copied: mlocate/repos/core-x86_64/updatedb.conf (from rev 152303, mlocate/repos/testing-x86_64/updatedb.conf)
===================================================================
--- core-x86_64/updatedb.conf	                        (rev 0)
+++ core-x86_64/updatedb.conf	2012-03-06 15:10:37 UTC (rev 152305)
@@ -0,0 +1,5 @@
+# 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"

Deleted: core-x86_64/updatedb.cron.daily
===================================================================
--- core-x86_64/updatedb.cron.daily	2012-03-06 15:10:36 UTC (rev 152304)
+++ core-x86_64/updatedb.cron.daily	2012-03-06 15:10:37 UTC (rev 152305)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEDB="/usr/bin/updatedb"
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}"
-fi
-
-# Update the "locate" database
-if [ -x /usr/bin/updatedb ]; then
-  if [ -f /etc/updatedb.conf ]; then
-    ${UPDATEDB}
-  else
-    ${UPDATEDB} -f proc
-  fi
-fi

Copied: mlocate/repos/core-x86_64/updatedb.cron.daily (from rev 152303, mlocate/repos/testing-x86_64/updatedb.cron.daily)
===================================================================
--- core-x86_64/updatedb.cron.daily	                        (rev 0)
+++ core-x86_64/updatedb.cron.daily	2012-03-06 15:10:37 UTC (rev 152305)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
+NICE=19
+
+# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
+IONICE_CLASS=2
+
+# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
+IONICE_PRIORITY=7
+
+UPDATEDB="/usr/bin/updatedb"
+
+if [ -x /usr/bin/nice ]; then
+  UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
+fi
+
+if [ -x /usr/bin/ionice ]; then
+  UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}"
+fi
+
+# Update the "locate" database
+if [ -x /usr/bin/updatedb ]; then
+  if [ -f /etc/updatedb.conf ]; then
+    ${UPDATEDB}
+  else
+    ${UPDATEDB} -f proc
+  fi
+fi



More information about the arch-commits mailing list