From a50622f2a92acb1a48a3aa651d58381884ff163c Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Mon, 15 Nov 2010 22:18:39 +0000
Subject: dbus: upgrade for libx11

---
 abs/core/dbus/PKGBUILD | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/abs/core/dbus/PKGBUILD b/abs/core/dbus/PKGBUILD
index 5759c51..da5da51 100644
--- a/abs/core/dbus/PKGBUILD
+++ b/abs/core/dbus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 73275 2010-03-24 11:40:17Z jgc $
+# $Id: PKGBUILD 90544 2010-09-13 10:56:13Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.2.24
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -13,7 +13,7 @@ depends=("dbus-core>=${pkgver}" 'libx11')
 makedepends=('libsm' 'libice')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
         30-dbus)
-md5sums=('565346cecd9cfecf1463540c6086cc2c'
+md5sums=('f59618b18d2fb2bd1fce9e1c5a2a3282'
          'd14e59575f04e55d21a04907b6fd9f3c')
 
 build() {
@@ -23,17 +23,20 @@ build() {
       --with-system-pid-file=/var/run/dbus.pid \
       --disable-verbose-mode --disable-static \
       --enable-inotify --disable-dnotify \
-      --disable-tests --disable-asserts || return 1
-  cd tools || return 1
+      --disable-tests --disable-asserts
+  cd tools
   make dbus-launch || return 1
+}
+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/" || return 1
+  install -m644 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/" || return 1
+  install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/"
 
   install -d -m755 "${pkgdir}/usr/share/licenses/dbus"
-  install -m644 ../COPYING "${pkgdir}/usr/share/licenses/dbus/" || return 1
+  install -m644 ../COPYING "${pkgdir}/usr/share/licenses/dbus/"
 }
-- 
cgit v0.12

