Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Thu Feb 3 01:26:14 CET 2011. -------- --- xorg-x11/xorg-x11.changes 2011-01-14 14:49:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-02-01 13:31:19.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Jan 29 23:06:52 UTC 2011 - gber@opensuse.org + +- changed then handling of DEFAULT_WM in /etc/init.d/xdm, it will + now look for a corresponding session file which has the same + basename as DEFAULT_WM and, if found, set WINDOWMANAGER to the + value of Exec; if there is no session file it will try to set + WINDOWMANAGER to an executable with the same name as DEFAULT_WM + (bnc#667408) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.Z1wF8t/_old 2011-02-03 01:25:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Z1wF8t/_new 2011-02-03 01:25:44.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: bison Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 2 +Release: 3 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2010-07-19 17:11:25.000000000 +0200 +++ new/etc/init.d/xdm 2011-02-02 12:34:51.000000000 +0100 @@ -56,13 +56,26 @@ done unset lc val -test -z "$DEFAULT_WM" && DEFAULT_WM=twm -SAVEPATH=$PATH -PATH=$PATH:/usr/X11R6/bin:/opt/gnome/bin:/usr/openwin/bin -WINDOWMANAGER="`type -p ${DEFAULT_WM##*/}`" -PATH=$SAVEPATH +if test -z "$WINDOWMANAGER" ; then + SAVEPATH=$PATH + PATH=$PATH:/usr/X11R6/bin:/usr/openwin/bin + desktop=/usr/share/xsessions/${DEFAULT_WM}.desktop + if test -s "$desktop" ; then + while read -r line; do + case ${line} in + Exec=*) WINDOWMANAGER="$(command -v ${line#Exec=})" + break + esac + done < $desktop + fi + if test -n "$DEFAULT_WM" -a -z "$WINDOWMANAGER" ; then + WINDOWMANAGER="$(command -v ${DEFAULT_WM##*/})" + fi + PATH=$SAVEPATH + unset SAVEPATH desktop +fi +unset DEFAULT_WM export WINDOWMANAGER -unset DEFAULT_WM SAVEPATH XDM_PIDFILE="/var/run/xdm.pid" KDM_PIDFILE="/var/run/kdm.pid" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org