[arch-commits] Commit in dbus-core/trunk (PKGBUILD dbus.install)

[Dave Reisner]

    Date: Sunday, June 24, 2012 @ 21:18:52
  Author: dreisner
Revision: 162319

upgpkg: dbus-core 1.6.0-5

- remove dbus-uuidgen logic from install scriplet, depend on systemd-machine-id-setup

Modified:
  dbus-core/trunk/PKGBUILD
  dbus-core/trunk/dbus.install

--------------+
 PKGBUILD     |    4 ++--
 dbus.install |    6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-25 01:17:52 UTC (rev 162318)
+++ PKGBUILD	2012-06-25 01:18:52 UTC (rev 162319)
@@ -4,12 +4,12 @@
 #
 pkgname=dbus-core
 pkgver=1.6.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow') # shadow for install scriptlet FS#29341
+depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
 makedepends=('libx11')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)

Modified: dbus.install
===================================================================
--- dbus.install	2012-06-25 01:17:52 UTC (rev 162318)
+++ dbus.install	2012-06-25 01:18:52 UTC (rev 162319)
@@ -2,12 +2,6 @@
   getent group dbus >/dev/null || groupadd -g 81 dbus
   getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
   passwd -l dbus &>/dev/null
-
-  if [[ ! -L var/lib/dbus/machine-id ]]; then
-    [[ -e var/lib/dbus/machine-id && ! -e etc/machine-id ]] && mv var/lib/dbus/machine-id etc/
-    ln -sf ../../../etc/machine-id var/lib/dbus/
-  fi
-  dbus-uuidgen --ensure=etc/machine-id
 }
 
 post_upgrade() {