Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2014-05-22 20:38:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm" Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2014-03-27 06:17:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-05-22 20:38:34.000000000 +0200 @@ -1,0 +2,13 @@ +Thu May 15 11:01:55 UTC 2014 - [email protected] + +- Don't run dbus-launch if the socket /run/user/<uid>/bus exists, since + this means that dbus is already handled by systemd + +------------------------------------------------------------------- +Tue May 13 05:31:18 UTC 2014 - [email protected] + +- just don't "package" pid file. It's called xdm.pid, so it's pretty + obvious what package it is from +- take the pid file out of the xdm.tar + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.spec ++++++ --- /var/tmp/diff_new_pack.4DNhUo/_old 2014-05-22 20:38:35.000000000 +0200 +++ /var/tmp/diff_new_pack.4DNhUo/_new 2014-05-22 20:38:35.000000000 +0200 @@ -16,7 +16,7 @@ # -%if 0%{?suse_version} > 1220 +%if 0%{?suse_version} > 1230 %define with_systemd 1 %else %define with_systemd 0 @@ -208,7 +208,6 @@ %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors -%ghost %{_localstatedir}/run/xdm.pid %{_bindir}/chooser %{_bindir}/xdm %{_bindir}/xdmshell ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/sys.xsession new/etc/X11/xdm/sys.xsession --- old/etc/X11/xdm/sys.xsession 2014-03-04 13:53:31.000000000 +0100 +++ new/etc/X11/xdm/sys.xsession 2014-05-14 19:46:27.000000000 +0200 @@ -139,7 +139,12 @@ # # Check if a dbus is required for e.g. plain xdm sessions # -if dbusdaemon=$(type -p dbus-daemon) && dbuslaunch=$(type -p dbus-launch) ; then +if test -S "$XDG_RUNTIME_DIR/bus" ; then + # socket /run/user/uid/bus exists, this means dbus is managed by systemd + # all we have to do now is make sure $DBUS_SESSION_BUS_ADDRESS is set correctly + DBUS_SESSION_BUS_ADDRESS="unix:path=$XDG_RUNTIME_DIR/bus" + export DBUS_SESSION_BUS_ADDRESS +elif dbusdaemon=$(type -p dbus-daemon) && dbuslaunch=$(type -p dbus-launch) ; then if test -s /var/lib/dbus/machine-id ; then read -t1 mid < /var/lib/dbus/machine-id elif test -s /etc/machine-id ; then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
