[arch-commits] Commit in dbus/trunk (30-dbus PKGBUILD)

[Jan de Groot]

    Date: Saturday, October 11, 2008 @ 18:05:55
  Author: jgc
Revision: 14999

upgpkg: dbus 1.2.3-2
    Split into standalone x11 package.
Add scriptlet that launches dbus when sessions are started from gdm or others that source xinitrc.d

Added:
  dbus/trunk/30-dbus
Modified:
  dbus/trunk/PKGBUILD

----------+
 30-dbus  |    9 +++++++++
 PKGBUILD |   43 ++++++++++++++++---------------------------
 2 files changed, 25 insertions(+), 27 deletions(-)

Added: 30-dbus
===================================================================
--- 30-dbus	                        (rev 0)
+++ 30-dbus	2008-10-11 22:05:55 UTC (rev 14999)
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# launches a session dbus instance
+
+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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-11 22:04:36 UTC (rev 14998)
+++ PKGBUILD	2008-10-11 22:05:55 UTC (rev 14999)
@@ -4,45 +4,34 @@
 #
 pkgname=dbus
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-depends=('expat>=2.0' 'libx11' 'libsm')
-options=(!libtool)
-install=dbus.install
+depends=("dbus-core>=${pkgver}" 'libx11' 'libsm')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	dbus)
-md5sums=('f71641385768e99361bd298568207cee'
-         'f3fd196cc278bd7b45a4ca01fb8f7894')
+	30-dbus)
+md5sums=('f71641385768e99361bd298568207cee' 'd14e59575f04e55d21a04907b6fd9f3c')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${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 || return 1
-  make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  chown 81:81 ${startdir}/pkg/var/run/dbus || return 1
+  cd tools || return 1
+  make dbus-launch || return 1
+  install -m755 -d ${pkgdir}/usr/bin
+  install -m755 -d ${pkgdir}/usr/share/man/man1
+  install -m644 dbus-launch ${pkgdir}/usr/bin/ || return 1
+  install -m644 dbus-launch.1 ${pkgdir}/usr/share/man/man1/ || return 1
 
-  install -m755 -d  ${startdir}/pkg/etc/rc.d || return 1
-  install -m 755 ${startdir}/dbus ${startdir}/pkg/etc/rc.d/ || return 1
+  install -m755 -d ${pkgdir}/etc/X11/xinit/xinitrc.d
+  install -m755 ${srcdir}/30-dbus ${pkgdir}/etc/X11/xinit/xinitrc.d/ || return 1
 
-  #Fix configuration file
-  sed -i -e 's|<user>81</user>|<user>dbus</user>|' ${startdir}/pkg/etc/dbus-1/system.conf || return 1
-
-  #install .keep files so pacman doesn't delete empty dirs
-  touch ${startdir}/pkg/usr/share/dbus-1/services/.keep || return 1
-  touch ${startdir}/pkg/usr/share/dbus-1/system-services/.keep || return 1
-  touch ${startdir}/pkg/etc/dbus-1/session.d/.keep || return 1
-  touch ${startdir}/pkg/etc/dbus-1/system.d/.keep || return 1
-
-  rmdir ${startdir}/pkg/usr/lib/dbus-1.0/dbus-1 || return 1
-
-  install -d -m755 ${startdir}/pkg/usr/share/licenses/dbus
-  install -m644 ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-    ${startdir}/pkg/usr/share/licenses/dbus/ || return 1
+  install -d -m755 ${startdir}/pkg/usr/share/licenses || return 1
+  ln -sf dbus-core ${pkgdir}/usr/share/licenses/dbus || return 1
 }