Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3524d4936a0a9448ad35e40c4aeffe949737de28

commit 3524d4936a0a9448ad35e40c4aeffe949737de28
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Aug 29 18:47:17 2011 +0200

dbus-1.5.6-2-i686

- drop no longer needed rc script

diff --git a/source/base/dbus/FrugalBuild b/source/base/dbus/FrugalBuild
index 9ad244f..83a7296 100644
--- a/source/base/dbus/FrugalBuild
+++ b/source/base/dbus/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=dbus
pkgver=1.5.6
-pkgrel=1
+pkgrel=2
pkgdesc="A message bus system"
url="http://freedesktop.org/wiki/Software_2fdbus";
depends=('libxml2>=2.7.8' 'expat')
@@ -13,9 +13,8 @@ groups=('base')
archs=('i686' 'x86_64' 'ppc' 'arm')
up2date="lynx -dump http://dbus.freedesktop.org/releases/dbus/|Flasttar"
source=(http://dbus.freedesktop.org/releases/dbus/$pkgname-$pkgver.tar.gz \
-       rc.$pkgname dbus-1-launch dbus-1-launch.desktop)
+       dbus-1-launch dbus-1-launch.desktop)
sha1sums=('bc9ae54d5f6ce02faaf9f5579b6da594c2cc372f' \
-          '72f1aa43b2d7c0c29e71b096af7b2f8819982ba9' \
'740af74eb43cadf1277346029577aadd3d10f2b5' \
'da9efab479aa3a2a8fb365a89ed658646486c39f')

@@ -54,7 +53,6 @@ build()
--disable-tests \
--disable-selinux \
--with-systemdsystemunitdir=/lib/systemd/system
-       Frcd2

## DO NOT change that without to ask the Maintainer! ##
## Install wrapper
diff --git a/source/base/dbus/dbus.install b/source/base/dbus/dbus.install
index 9aff8bb..d764a31 100644
--- a/source/base/dbus/dbus.install
+++ b/source/base/dbus/dbus.install
@@ -11,9 +11,7 @@ post_install()

/usr/bin/dbus-uuidgen --ensure

-       if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then
-               /usr/sbin/chkconfig --add rc.dbus
-       fi
+       systemctl enable dbus.service >/dev/null 2>&1
}

post_upgrade()
@@ -32,18 +30,27 @@ post_upgrade()

/usr/bin/dbus-uuidgen --ensure

+       systemctl daemon-reload >/dev/null 2>&1
+       # this can be removed after Frugalware-1.6
+       rm -f /etc/rc.d/rc?.d/???rc.dbus
+
}
+
pre_remove()
{
-       if [ -e /usr/sbin/chkconfig ] && [ -x /usr/sbin/chkconfig ]; then
-               /usr/sbin/chkconfig --del rc.dbus
-       fi
## mabye already removed ?
if  grep -q 'messagebus' /etc/group; then
/usr/sbin/userdel messagebus 2>/dev/null
/usr/sbin/groupdel messagebus 2>/dev/null
fi

+       systemctl --no-reload disable dbus.service >/dev/null 2>&1
+       systemctl stop dbus.service >/dev/null 2>&1
+}
+
+post_remove()
+{
+       systemctl daemon-reload >/dev/null 2>&1
}

op=$1
diff --git a/source/base/dbus/rc.dbus b/source/base/dbus/rc.dbus
deleted file mode 100644
index 12ffcc0..0000000
--- a/source/base/dbus/rc.dbus
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-# (c) 2004 Laszlo Dvornik <dvor...@gnome.hu>
-# rc.dbus for FrugalWare
-# distributed under GPL License
-
-# chkconfig: 2345 97 03
-# description: This is a daemon which broadcasts notifications of system events
-#              and other messages.
-
-source /lib/initscripts/functions
-actions=(start stop restart status)
-daemon=$"system message bus"
-
-pid="cat /var/run/dbus/dbus.pid 2> /dev/null"
-
-rc_start()
-{
-       start_msg
-       # check if dbus is already running
-       if [ ! -z "$(eval $pid)" ]; then
-               ok 999
-       else
-               ## that too
-               chown messagebus:messagebus  /var/run/dbus
-               ## bug #860
-               [ -d /usr/share/dbus-1/services ] || mkdir -p 
/usr/share/dbus-1/services
-               ## this need be here
-               /usr/bin/dbus-uuidgen --ensure
-               /usr/bin/dbus-daemon --system
-               ok $?
-       fi
-}
-
-rc_stop()
-{
-       stop_msg
-       if [ -n "$(eval $pid)" ]; then
-               killall dbus-daemon
-               rm -f /var/run/dbus/dbus.pid
-               ok $?
-       else
-               ok 999
-       fi
-}
-
-rc_exec $1
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to