Accepting request 51554 from Base:System

Accepted submit request 51554 from user coolo

OBS-URL: https://build.opensuse.org/request/show/51554
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dbus-1?expand=0&rev=55
This commit is contained in:
Ruediger Oertel 2010-10-28 10:27:03 +00:00 committed by Git OBS Bridge
commit ee80aab4aa
4 changed files with 21 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 12 14:35:53 UTC 2010 - cristian.rodriguez@opensuse.org
- ConsoleKit may not be installed on the system, so kill
the process at "stop" only if it is running
-------------------------------------------------------------------
Fri Sep 24 18:21:46 UTC 2010 - cristian.rodriguez@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package dbus-1-x11 (Version 1.4.0)
# spec file for package dbus-1-x11 (Version 1.2.16)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,6 @@
# norootforbuild
Name: dbus-1-x11
BuildRequires: xorg-x11-devel
Url: http://dbus.freedesktop.org/

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 12 14:35:53 UTC 2010 - cristian.rodriguez@opensuse.org
- ConsoleKit may not be installed on the system, so kill
the process at "stop" only if it is running
-------------------------------------------------------------------
Fri Sep 24 18:21:46 UTC 2010 - cristian.rodriguez@opensuse.org

View File

@ -30,6 +30,10 @@ DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id
DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen
CONSOLEKIT_DAEMON_BIN="/usr/sbin/console-kit-daemon"
CONSOLEKIT_PID_DIR="/var/run/ConsoleKit"
CONSOLEKIT_PID=$CONSOLEKIT_PID_DIR/pid
# Source LSB init functions
# providing start_daemon, killproc, pidofproc,
# log_success_msg, log_failure_msg and log_warning_msg.
@ -72,7 +76,9 @@ case "$1" in
;;
stop)
echo -n "Shutting down D-Bus daemon"
killproc -TERM /usr/sbin/console-kit-daemon
if [ -x $CONSOLEKIT_DAEMON_BIN ] ; then
killproc -p $CONSOLEKIT_PID -TERM $CONSOLEKIT_DAEMON_BIN
fi
killproc -p $DBUS_DAEMON_PID -TERM $DBUS_DAEMON_BIN
rc_status -v
;;