Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Wed Feb 2 01:52:57 CET 2011. -------- --- aaa_base/aaa_base.changes 2011-01-25 11:29:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-02-01 13:21:59.000000000 +0100 @@ -1,0 +2,21 @@ +Tue Feb 1 13:19:37 CET 2011 - werner@suse.de + +- Also do the job for tcsh users +- Be backward compatible to support existing sysconfig files +- Fix for bnc#668180: redirect stderr of pidofproc to /dev/null + +------------------------------------------------------------------- +Sat Jan 29 20:28:09 UTC 2011 - gber@opensuse.org + +- changed /etc/profile.d/profile.sh so it treats DEFAULT_WM as the + basename of the session file and parses the value of Exec into + WINDOWMANAGER (bnc#667408) +- adopted the possible values of DEFAULT_WM to use the basename of + the session file (bnc#667408) + +------------------------------------------------------------------- +Fri Jan 28 14:41:57 CET 2011 - ro@suse.de + +- fix typo in SuSEconfig manpage (bnc#662695) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.ynfxdZ/_old 2011-02-02 01:52:21.000000000 +0100 +++ /var/tmp/diff_new_pack.ynfxdZ/_new 2011-02-02 01:52:21.000000000 +0100 @@ -20,7 +20,7 @@ Name: aaa_base Version: 11.4 -Release: 23 +Release: 24 License: GPLv2+ Group: System/Fhs Provides: bin bootutls etc skeleng skelger ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile.d/profile.csh new/aaa_base/etc/profile.d/profile.csh --- old/aaa_base/etc/profile.d/profile.csh 2008-10-02 15:36:10.000000000 +0200 +++ new/aaa_base/etc/profile.d/profile.csh 2011-02-01 13:18:02.000000000 +0100 @@ -107,17 +107,32 @@ # # Do not use the `which' builtin nor set path to avoid a rehash # -if (! ${?default_wm} ) set default_wm -if ( ${%default_wm} > 0 && ! ${?WINDOWMANAGER} ) then +if ( ! ${?WINDOWMANAGER} ) then + if (! ${?default_wm} ) set default_wm + set desktop="/usr/share/xsessions/${default_wm}.desktop" set default_wm=${default_wm:t} - foreach val ($path /usr/X11R6/bin /usr/openwin/bin) - if ( ${val:q} =~ *.* ) continue - set val=${val:q}/${default_wm:q} - if ( ! -x ${val:q} ) continue - setenv WINDOWMANAGER ${val:q} - break - end - unset val + if ( -s ${desktop:q} ) then + set wm=`sed -rn '/^Exec=/{s@[^=]*=([^=]*)@\1@p;}' ${desktop:q}` + foreach val ($path /usr/X11R6/bin /usr/openwin/bin) + if ( ${val:q} =~ *.* ) continue + set val=${val:q}/${wm:q} + if ( ! -x ${val:q} ) continue + setenv WINDOWMANAGER ${val:q} + break + end + unset val wm + endif + unset desktop + if ( ${%default_wm} > 0 && ! ${?WINDOWMANAGER} ) then + foreach val ($path /usr/X11R6/bin /usr/openwin/bin) + if ( ${val:q} =~ *.* ) continue + set val=${val:q}/${default_wm:q} + if ( ! -x ${val:q} ) continue + setenv WINDOWMANAGER ${val:q} + break + end + unset val + endif endif unset default_wm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/profile.d/profile.sh new/aaa_base/etc/profile.d/profile.sh --- old/aaa_base/etc/profile.d/profile.sh 2010-01-13 14:53:33.000000000 +0100 +++ new/aaa_base/etc/profile.d/profile.sh 2011-02-01 13:15:38.000000000 +0100 @@ -106,15 +106,26 @@ fi unset PROXY_ENABLED -if test -n "$DEFAULT_WM" -a -z "$WINDOWMANAGER" ; then +if test -z "$WINDOWMANAGER" ; then SAVEPATH=$PATH PATH=$PATH:/usr/X11R6/bin:/usr/openwin/bin - WINDOWMANAGER="`type -p ${DEFAULT_WM##*/}`" + desktop=/usr/share/xsessions/${DEFAULT_WM}.desktop + if test -s "$desktop" ; then + while read -r line; do + case ${line} in + Exec=*) WINDOWMANAGER="$(type -p ${line#Exec=})" + break + esac + done < $desktop + fi + if test -n "$DEFAULT_WM" -a -z "$WINDOWMANAGER" ; then + WINDOWMANAGER="$(type -p ${DEFAULT_WM##*/})" + fi PATH=$SAVEPATH - export WINDOWMANAGER - unset SAVEPATH + unset SAVEPATH desktop fi unset DEFAULT_WM +export WINDOWMANAGER if test -n "$CONSOLE_MAGIC" ; then case "$(tty 2> /dev/null)" in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/etc/rc.status new/aaa_base/etc/rc.status --- old/aaa_base/etc/rc.status 2011-01-12 13:05:40.000000000 +0100 +++ new/aaa_base/etc/rc.status 2011-02-01 13:13:57.000000000 +0100 @@ -347,7 +347,7 @@ parent_processes="${parent_processes:+$parent_processes:}${ppid}" done for comm ; do - ppid="$(/sbin/pidofproc $comm)" || continue + ppid="$(/sbin/pidofproc $comm 2> /dev/null)" || continue parent_processes="${parent_processes:+$parent_processes:}${ppid}" done unset comm state ppid rest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/usr/share/man/man8/SuSEconfig.8 new/aaa_base/usr/share/man/man8/SuSEconfig.8 --- old/aaa_base/usr/share/man/man8/SuSEconfig.8 2003-11-18 12:50:07.000000000 +0100 +++ new/aaa_base/usr/share/man/man8/SuSEconfig.8 2011-01-28 14:41:48.000000000 +0100 @@ -47,7 +47,7 @@ .SH NOTE SuSEconfig must be run by the root user. .SH FILES -/etc/conf.d/*, +/sbin/conf.d/*, /etc/sysconfig/* .BR .SH "SEE ALSO" ++++++ sysconfig_parts.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig_parts/sysconfig.windowmanager new/sysconfig_parts/sysconfig.windowmanager --- old/sysconfig_parts/sysconfig.windowmanager 2008-12-08 02:06:18.000000000 +0100 +++ new/sysconfig_parts/sysconfig.windowmanager 2011-01-29 21:26:25.000000000 +0100 @@ -1,12 +1,12 @@ ## Path: Desktop/Window manager ## Description: -## Type: string(gnome,startkde,startkde3,startxfce4,twm) +## Type: string(gnome,kde4,kde,LXDE,xfce,twm,icewm) ## Default: kde ## Config: profiles,kde,susewm # # Here you can set the default window manager (kde, fvwm, ...) # changes here require at least a re-login -DEFAULT_WM="startkde" +DEFAULT_WM="kde4" ## Type: yesno ## Default: yes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org