Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2014-01-08 20:10:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit" Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2013-09-17 15:05:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2014-01-08 20:10:11.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 8 13:57:53 UTC 2014 - [email protected] + +- don't call the obsolete wmlist. Read /usr/share/xsessions instead. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit.spec ++++++ --- /var/tmp/diff_new_pack.foIrSS/_old 2014-01-08 20:10:12.000000000 +0100 +++ /var/tmp/diff_new_pack.foIrSS/_new 2014-01-08 20:10:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xinit # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 ++++++ xinit.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xinit/xinitrc.common new/etc/X11/xinit/xinitrc.common --- old/etc/X11/xinit/xinitrc.common 2013-09-16 16:39:49.000000000 +0200 +++ new/etc/X11/xinit/xinitrc.common 2014-01-08 14:57:23.000000000 +0100 @@ -66,18 +66,38 @@ # test -n "$WINDOWMANAGER" && WINDOWMANAGER="$(type -p $WINDOWMANAGER 2>/dev/null)" if test -z "$WINDOWMANAGER" ; then - if test -x /usr/X11R6/bin/kde -o -x /usr/bin/kde; then - WINDOWMANAGER=$(type -p kde) - elif test -x /usr/X11R6/bin/startkde -o -x /usr/bin/startkde; then - WINDOWMANAGER=$(type -p startkde) - elif test -x /usr/X11R6/bin/fvwm2 -o -x /usr/bin/fvwm2; then - WINDOWMANAGER=$(type -p fvwm2) - elif test -x /usr/X11R6/bin/wmlist -o -x /usr/bin/wmlist ; then - for i in $($(type -p wmlist)) ; do - WINDOWMANAGER="$(type -p $i 2>/dev/null)" - test -n "$WINDOWMANAGER" && break - done - fi + _find_wm() + { + local x + local i + local file + local dir="/usr/share/xsessions" + # prefer the desktops resp icewm as it's used by YaST anyways + for i in kde gnome xfce lxde icewm; do + if [ -e "$dir/$i.desktop" ]; then + file="$dir/$i.desktop" + break + fi + done + if [ -z "$file" ]; then + # let's pick the first one + local files=($dir/*.desktop) + file="${files[0]}" + # coolo doesn't like twm + if [ "$file" != "${file%twm.desktop}" -a -n "${files[1]}" ]; then + file="${files[1]}" + fi + fi + if [ -n "$file" ]; then + while read line; do + x="${line#Exec=}" + [ "$line" = "$x" ] || break + done < "$file" + fi + WINDOWMANAGER=`type -p "$x"` + } + _find_wm + unset _find_wm fi # -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
