summaryrefslogtreecommitdiff
path: root/core/dbus-core
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-06-28 00:01:48 +0000
committerroot <root@rshg054.dnsready.net>2012-06-28 00:01:48 +0000
commitad4cbb616af1b40790c6533f1d5b98dbd7aaa199 (patch)
treebb9eaf0dec4bf5c449ccc9236b02ea993f69f9fe /core/dbus-core
parent5aee7ab49f65d6fee1182bfcacf92192ad36c4af (diff)
Thu Jun 28 00:01:48 UTC 2012
Diffstat (limited to 'core/dbus-core')
-rw-r--r--core/dbus-core/PKGBUILD6
-rw-r--r--core/dbus-core/dbus.install6
2 files changed, 3 insertions, 9 deletions
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD
index c2ca50617..587604851 100644
--- a/core/dbus-core/PKGBUILD
+++ b/core/dbus-core/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 162315 2012-06-24 22:30:38Z dreisner $
+# $Id: PKGBUILD 162424 2012-06-27 01:43:40Z dreisner $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Link Dupont <link@subpop.net>
#
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)
diff --git a/core/dbus-core/dbus.install b/core/dbus-core/dbus.install
index 88a568429..f1ffd61a8 100644
--- a/core/dbus-core/dbus.install
+++ b/core/dbus-core/dbus.install
@@ -2,12 +2,6 @@ post_install() {
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() {