Date: Saturday, April 27, 2013 @ 14:34:44 Author: tomegun Revision: 183714
upgpkg: dbus 1.6.10-1 upstream release drop rc script drop install scriptlet drop shadow dependency add systemd makedepend Modified: dbus/trunk/PKGBUILD Deleted: dbus/trunk/dbus dbus/trunk/dbus.install --------------+ PKGBUILD | 20 +++++++------------- dbus | 51 --------------------------------------------------- dbus.install | 6 ------ 3 files changed, 7 insertions(+), 70 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-04-27 12:31:41 UTC (rev 183713) +++ PKGBUILD 2013-04-27 12:34:44 UTC (rev 183714) @@ -4,24 +4,21 @@ # Contributor: Link Dupont <l...@subpop.net> # pkgname=dbus -pkgver=1.6.8 -pkgrel=6 +pkgver=1.6.10 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus"; arch=(i686 x86_64) license=('GPL' 'custom') -# do not depend on systemd to avoid circular dep, -# dep on shadow for install scriptlet FS#29341 -depends=('expat' 'coreutils' 'filesystem' 'shadow') -makedepends=('libx11') +depends=('expat' 'coreutils' 'filesystem') +makedepends=('libx11' 'systemd') optdepends=('libx11: dbus-launch support') provides=('dbus-core') conflicts=('dbus-core') replaces=('dbus-core') options=(!libtool) -install=dbus.install -source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc} - 30-dbus dbus systemd-user-session.patch) +source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz + 30-dbus systemd-user-session.patch) build() { cd dbus-$pkgver @@ -47,13 +44,10 @@ rm -rf "$pkgdir/var/run" - install -Dm755 ../dbus "$pkgdir/etc/rc.d/dbus" - install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus" install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING" } -md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2' +md5sums=('de4970c20629aeb958a12132415b3630' '3314d727fa57fc443fce25b5cbeebbcc' - 'f0364f3f5dc5f653bb05d39aa36e3264' 'd8a1bd529b3ddca671ee1a695a143db9') Deleted: dbus =================================================================== --- dbus 2013-04-27 12:31:41 UTC (rev 183713) +++ dbus 2013-04-27 12:34:44 UTC (rev 183714) @@ -1,51 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case $1 in - start) - stat_busy "Starting D-BUS system messagebus" - if [[ ! -d /run/dbus ]] ; then - install -m755 -g 81 -o 81 -d /run/dbus - fi - - if ! dbus-daemon --system; then - stat_fail - else - add_daemon dbus - stat_done - fi - ;; - stop) - stat_busy "Stopping D-BUS system messagebus" - if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then - stat_fail - else - rm -f /run/dbus/pid - rm_daemon dbus - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading D-BUS configuration" - if ! { [[ -f /run/dbus/pid ]] && dbus-send \ - --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig; }; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 Deleted: dbus.install =================================================================== --- dbus.install 2013-04-27 12:31:41 UTC (rev 183713) +++ dbus.install 2013-04-27 12:34:44 UTC (rev 183714) @@ -1,6 +0,0 @@ -post_upgrade() { - # Make sure new rc script can shutdown running dbus - if [ -f run/dbus.pid -a -d run/dbus ]; then - mv run/dbus.pid run/dbus/pid - fi -}
