Author: mvidner Date: Thu Jul 2 14:56:13 2009 New Revision: 57851 URL: http://svn.opensuse.org/viewcvs/yast?rev=57851&view=rev Log: Removed the dependency on dbus-1-x11 by calling dbus-daemon directly without dbus-launch. Modified: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_server branches/tmp/mvidner/core-dbus-values/yast2-core.spec.in Modified: branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_server URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_server?rev=57851&r1=57850&r2=57851&view=diff ============================================================================== --- branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_server (original) +++ branches/tmp/mvidner/core-dbus-values/dbus/namespace_service/testsuite/test_server Thu Jul 2 14:56:13 2009 @@ -13,11 +13,21 @@ # This launches the bus daemon, # exports DBUS_SESSION_BUS_ADDRESS and sets DBUS_SESSION_BUS_PID -# FIXME dbus-launch is in dbus-1-x11, an unnecessary dependency -eval $(dbus-launch --sh-syntax) -# Clean up at exit. This will also kill the server. -trap "kill $DBUS_SESSION_BUS_PID" EXIT TERM INT +my_dbus_launch () { + # reimplementing dbus-launch because it is in dbus-1-x11.rpm + PF=`mktemp --tmpdir dbus.pid.XXXXXX` || exit + AF=`mktemp --tmpdir dbus.addr.XXXXXX` || exit + dbus-daemon --session --print-address=3 3>$AF --print-pid=4 4>$PF & + # wait for the daemon to print the info + while [ ! -s $AF -a ! -s $PF ]; do sleep 0.1; done + DBUS_SESSION_BUS_PID=$(cat $PF) + export DBUS_SESSION_BUS_ADDRESS=$(cat $AF) + # Clean up at exit. This will also kill the server. + trap "kill $DBUS_SESSION_BUS_PID; rm $AF $PF" EXIT TERM INT +} + +my_dbus_launch echo -n "Hey, server, get on da bus... " # start the server $SERVER & sleep 3 Modified: branches/tmp/mvidner/core-dbus-values/yast2-core.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/core-dbus-values/yast2-core.spec.in?rev=57851&r1=57850&r2=57851&view=diff ============================================================================== --- branches/tmp/mvidner/core-dbus-values/yast2-core.spec.in (original) +++ branches/tmp/mvidner/core-dbus-values/yast2-core.spec.in Thu Jul 2 14:56:13 2009 @@ -25,7 +25,7 @@ BuildRequires: libxcrypt-devel # for SCR DBus service -BuildRequires: dbus-1-devel dbus-1-x11 PolicyKit-devel +BuildRequires: dbus-1-devel PolicyKit-devel Summary: YaST2 - Core Libraries Requires: perl = %{perl_version} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org