[arch-commits] CVS update of extra/daemons/dbus (3 files)

[Jan de Groot]

    Date: Wednesday, March 12, 2008 @ 16:53:50
  Author: jgc
    Path: /home/cvs-extra/extra/daemons/dbus

Modified: PKGBUILD (1.8 -> 1.9) dbus.install (1.2 -> 1.3)
 Removed: dbus-0.62-sleep-before-reload.patch (1.1)

upgpkg: dbus 1.1.20-1
    Update to 1.1.20: remove old patches, disable assertions, crash your hal-enabled Xorg-server on upgrade


-------------------------------------+
 PKGBUILD                            |   46 ++++++++++++++++++----------------
 dbus-0.62-sleep-before-reload.patch |   10 -------
 dbus.install                        |    5 ---
 3 files changed, 25 insertions(+), 36 deletions(-)


Index: extra/daemons/dbus/PKGBUILD
diff -u extra/daemons/dbus/PKGBUILD:1.8 extra/daemons/dbus/PKGBUILD:1.9
--- extra/daemons/dbus/PKGBUILD:1.8	Sun Feb 11 17:57:08 2007
+++ extra/daemons/dbus/PKGBUILD	Wed Mar 12 16:53:50 2008
@@ -1,40 +1,44 @@
-# $Id: PKGBUILD,v 1.8 2007/02/11 22:57:08 jgc Exp $
+# $Id: PKGBUILD,v 1.9 2008/03/12 20:53:50 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Link Dupont <link at subpop.net>
 #
 pkgname=dbus
-pkgver=1.0.2
-pkgrel=4
+pkgver=1.1.20
+pkgrel=1
 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=('nolibtool')
+options=(!libtool)
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	dbus
-	session.conf.patch
-	dbus-configcheck.patch)
-md5sums=('0552a9b54beb4a044951b7cdbc8fc855' 'bfb54a989fcde1fd2d6aef7fb45ee109'\
-         '8d97665ca3ffe6cbf306932dbca1dd37' '9e084d9b71fb0a04c5e4edddd7469323')
+	dbus)
+md5sums=('c552b9bc4b69e4c602644abc21b7661e' 'bfb54a989fcde1fd2d6aef7fb45ee109')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/session.conf.patch || return 1
-  patch -Np0 -i ${startdir}/src/dbus-configcheck.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  	      --with-dbus-user=81 \
+  	      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
               --with-system-pid-file=/var/run/dbus.pid \
               --disable-verbose-mode \
-	      --disable-tests --enable-asserts
+	      --disable-tests --disable-asserts || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  chown 81:81 ${startdir}/pkg/var/run/dbus
+  make DESTDIR=${startdir}/pkg install || return 1
+  chown 81:81 ${startdir}/pkg/var/run/dbus || return 1
 
-  mkdir -p ${startdir}/pkg/etc/rc.d
-  install -m 755 ${startdir}/dbus ${startdir}/pkg/etc/rc.d/dbus
-  touch ${startdir}/pkg/usr/share/dbus-1/services/.keep
-  mkdir -p ${startdir}/pkg/etc/dbus-1/session.d
-  touch ${startdir}/pkg/etc/dbus-1/session.d/.keep
-  touch ${startdir}/pkg/etc/dbus-1/system.d/.keep
+  install -m755 -d  ${startdir}/pkg/etc/rc.d || return 1
+  install -m 755 ${startdir}/dbus ${startdir}/pkg/etc/rc.d/ || 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
 }
Index: extra/daemons/dbus/dbus-0.62-sleep-before-reload.patch
diff -u extra/daemons/dbus/dbus-0.62-sleep-before-reload.patch:1.1 extra/daemons/dbus/dbus-0.62-sleep-before-reload.patch:removed
--- extra/daemons/dbus/dbus-0.62-sleep-before-reload.patch:1.1	Sun Oct 15 05:25:23 2006
+++ extra/daemons/dbus/dbus-0.62-sleep-before-reload.patch	Wed Mar 12 16:53:50 2008
@@ -1,10 +0,0 @@
---- dbus-0.62/bus/main.c.orig	2006-09-27 21:09:35.000000000 +0000
-+++ dbus-0.62/bus/main.c	2006-09-27 21:10:17.000000000 +0000
-@@ -46,6 +46,7 @@ signal_handler (int sig)
-     {
- #ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 
-     case SIGIO: 
-+      usleep(500000);
-       /* explicit fall-through */
- #endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX  */
-     case SIGHUP:
Index: extra/daemons/dbus/dbus.install
diff -u extra/daemons/dbus/dbus.install:1.2 extra/daemons/dbus/dbus.install:1.3
--- extra/daemons/dbus/dbus.install:1.2	Tue Feb  6 19:19:57 2007
+++ extra/daemons/dbus/dbus.install	Wed Mar 12 16:53:50 2008
@@ -19,8 +19,3 @@
   usr/sbin/userdel dbus &>/dev/null
   usr/sbin/groupdel dbus &>/dev/null
 }
-
-op=$1
-shift
-
-$op $*