[arch-commits] Commit in dbus-core/trunk (PKGBUILD dbus dbus.install)

[Jan de Groot]

    Date: Sunday, March 8, 2009 @ 08:54:06
  Author: jgc
Revision: 29356

upgpkg: dbus-core 1.2.4.4permissive-1
    Update to 1.2.4.4permissive:
- coreutils and filesystem are dependencies now. post_upgrade is rewritten (FS#12853)
- Add dbus-core to base (FS#12391)
- Supress stdout/err of kill command in /etc/rc.d/dbus (FS#12238)

Modified:
  dbus-core/trunk/PKGBUILD
  dbus-core/trunk/dbus
  dbus-core/trunk/dbus.install

--------------+
 PKGBUILD     |   13 +++++++------
 dbus         |    2 +-
 dbus.install |    9 ++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-08 11:45:50 UTC (rev 29355)
+++ PKGBUILD	2009-03-08 12:54:06 UTC (rev 29356)
@@ -3,20 +3,21 @@
 # Contributor: Link Dupont <link at subpop.net>
 #
 pkgname=dbus-core
-pkgver=1.2.4
+pkgver=1.2.4.4permissive
 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')
+depends=('expat>=2.0' 'coreutils' 'filesystem')
 conflicts=('dbus<1.2.3-2')
 options=(!libtool)
+groups=('base')
 install=dbus.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
 	dbus)
-md5sums=('2e643910a09f44b000a0d76038637999'
-         'f3fd196cc278bd7b45a4ca01fb8f7894')
+md5sums=('ec09ba2632edbc79133f2a5efaf0249b'
+         '08f93dd19cffd1b45ab05c1fd4efb560')
 
 build() {
   cd "${srcdir}/dbus-${pkgver}"
@@ -29,8 +30,8 @@
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 
-  rm -f ${pkgdir}/usr/bin/dbus-launch
-  rm -f ${pkgdir}/usr/share/man/man1/dbus-launch.1
+  rm -f "${pkgdir}/usr/bin/dbus-launch"
+  rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
 
   chown 81:81 "${pkgdir}/var/run/dbus" || return 1
 

Modified: dbus
===================================================================
--- dbus	2009-03-08 11:45:50 UTC (rev 29355)
+++ dbus	2009-03-08 12:54:06 UTC (rev 29356)
@@ -24,7 +24,7 @@
         ;;
     stop)
         stat_busy "Stopping D-BUS system messagebus"
-	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid`
+	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1
         if [ $? -gt 0 ]; then
             stat_fail
         else

Modified: dbus.install
===================================================================
--- dbus.install	2009-03-08 11:45:50 UTC (rev 29355)
+++ dbus.install	2009-03-08 12:54:06 UTC (rev 29356)
@@ -5,16 +5,15 @@
   dbus-uuidgen --ensure
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  post_install
 
   #Make sure new rc script can shutdown running dbus
-  [ -f var/run/dbus/pid ] && mv var/run/dbus/pid var/run/dbus.pid
+  if [ -f var/run/dbus/pid ]; then
+    mv var/run/dbus/pid var/run/dbus.pid
+  fi
 }
 
-# arg 1:  the old package version
 pre_remove() {
   usr/sbin/userdel dbus &>/dev/null
   usr/sbin/groupdel dbus &>/dev/null