diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-28 09:49:21 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-28 09:49:21 +0200 |
| commit | 937cae774d2b744fe7e00f250bd9d9333358a6ad (patch) | |
| tree | 3efee602086bae79708af013fe47a855439ff538 /core/dbus-core | |
| parent | bc23d831a86d6c4fee7da37fc1b8e677ab4e231d (diff) | |
| parent | ad4cbb616af1b40790c6533f1d5b98dbd7aaa199 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/systemd/PKGBUILD
extra/dbus-glib/PKGBUILD
extra/samba/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdegraphics-mobipocket/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
Diffstat (limited to 'core/dbus-core')
| -rw-r--r-- | core/dbus-core/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/dbus-core/dbus.install | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD index 8801c15d8..286deb9b4 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 'mips64el') 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() { |