From 6e17c873a304c292228a5172c6b0a2a5bd8f3460 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 6 Aug 2012 17:38:15 -0500
Subject: dbus 1.6.4

---
 abs/core/dbus/30-dbus  |  1 -
 abs/core/dbus/PKGBUILD | 38 +++++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/abs/core/dbus/30-dbus b/abs/core/dbus/30-dbus
index 603e92d..69d2660 100644
--- a/abs/core/dbus/30-dbus
+++ b/abs/core/dbus/30-dbus
@@ -6,4 +6,3 @@ dbuslaunch="`which dbus-launch 2>/dev/null`"
 if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
   eval `$dbuslaunch --sh-syntax --exit-with-session`
 fi
-
diff --git a/abs/core/dbus/PKGBUILD b/abs/core/dbus/PKGBUILD
index da5da51..02b2696 100644
--- a/abs/core/dbus/PKGBUILD
+++ b/abs/core/dbus/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 90544 2010-09-13 10:56:13Z jgc $
+# $Id: PKGBUILD 163850 2012-07-21 11:19:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.4.0
+pkgver=1.6.4
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=("dbus-core>=${pkgver}" 'libx11')
-makedepends=('libsm' 'libice')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
+depends=("dbus-core>=$pkgver" 'libx11')
+source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc}
         30-dbus)
-md5sums=('f59618b18d2fb2bd1fce9e1c5a2a3282'
-         'd14e59575f04e55d21a04907b6fd9f3c')
+md5sums=('5ec43dc4554cba638917317b2b4f7640'
+         '3d4482ee39b49da334441c76f83bf1cb'
+         '9fafe8b28460aeaa6054309ef4c5ed92')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
       --with-system-pid-file=/var/run/dbus.pid \
       --disable-verbose-mode --disable-static \
       --enable-inotify --disable-dnotify \
       --disable-tests --disable-asserts
-  cd tools
-  make dbus-launch || return 1
+  make -C tools dbus-launch
 }
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/tools"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m755 dbus-launch "${pkgdir}/usr/bin/" || return 1
-  install -m644 dbus-launch.1 "${pkgdir}/usr/share/man/man1/"
+  cd $pkgname-$pkgver
+  install -m755 -d "$pkgdir/usr/bin"
+  install -m755 -d "$pkgdir/usr/share/man/man1"
+  install -m755 tools/dbus-launch "$pkgdir/usr/bin/"
+  install -m644 doc/dbus-launch.1 "$pkgdir/usr/share/man/man1/"
 
-  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
-  install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/"
+  install -m755 -d "$pkgdir/etc/X11/xinit/xinitrc.d"
+  install -m755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/"
 
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus"
-  install -m644 ../COPYING "${pkgdir}/usr/share/licenses/dbus/"
+  install -d -m755 "$pkgdir/usr/share/licenses/dbus"
+  install -m644 COPYING "$pkgdir/usr/share/licenses/dbus/"
 }
-- 
cgit v0.12

