Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Thu Mar 18 23:19:25 CET 2010. -------- --- xorg-x11/xorg-x11.changes 2010-01-18 18:11:06.000000000 +0100 +++ xorg-x11/xorg-x11.changes 2010-03-17 12:15:15.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Mar 17 12:14:18 CET 2010 - werner@suse.de + +- Make xdm init scripts more flexible + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.ADPHu5/_old 2010-03-18 23:15:32.000000000 +0100 +++ /var/tmp/diff_new_pack.ADPHu5/_new 2010-03-18 23:15:32.000000000 +0100 @@ -26,7 +26,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 44 +Release: 45 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/X11/xdm/Xsession new/etc/X11/xdm/Xsession --- old/etc/X11/xdm/Xsession 2008-05-14 12:14:18.000000000 +0200 +++ new/etc/X11/xdm/Xsession 2010-03-17 12:04:15.000000000 +0100 @@ -92,13 +92,14 @@ case "$SHELL" in */csh|*/tcsh) ;; */sh|*/bash) ;; - */bash2|*/bash1) ;; - */pdksh|*/ksh) ;; - */zsh|*/ash) ;; + */bash[123]) ;; + */pdksh|*/ksh*) ;; + */zsh|*/ash|*/dash) ;; */rbash) shell=/bin/bash ;; */rsh) shell=/bin/sh ;; */rksh) shell=/bin/ksh ;; */rzsh) shell=/bin/zsh ;; + */true) shell=/bin/sh ;; *) shell=/bin/bash ;; esac exec -l -a ${shell##*/} ${shell} -c ${1+"exec $@"} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup --- old/etc/X11/xdm/Xsetup 2009-07-24 15:34:25.000000000 +0200 +++ new/etc/X11/xdm/Xsetup 2010-03-17 11:59:56.000000000 +0100 @@ -19,6 +19,12 @@ . /etc/sysconfig/displaymanager # +# Check for cpp +# +cpp=-nocpp +type -p cpp &> /dev/null && cpp= + +# # Background picture for plain xdm: # Store your preferred picture in XPM format (see xv(1) or ppm(5)) # You can run gzip on the file BackGround.xpm to save disk space. @@ -97,6 +103,16 @@ fi # +# Check if xdm is running +# + xdmpid=/var/run/xdm.pid + xdmroot=/usr/bin + xdm=no + +test -x ${xdmroot}/xdm && \ + /sbin/checkproc -p $xdmpid ${xdmroot}/xdm &> /dev/null && xdm=yes + +# # Check if kdm is running # kdmpid=/var/run/kdm.pid @@ -147,7 +163,7 @@ # First kdm/gdm choise, then xdm/user choise and # if no choise is given use the system defaults. # -if test "$kdm" = "yes" -o "$gdm" = "yes" ; then +if test "$xdm" = "no" ; then : # $xsetroot -solid '#738dc6' elif test -s ${background}.gz -a -x $xpmroot ; then $xpmroot ${background}.gz @@ -169,8 +185,8 @@ # # Xresources # -if test "$kdm" != "yes" -a "$gdm" != "yes" ; then - $xrdb -override -retain <<-EOF +if test "$xdm" = "yes" ; then + $xrdb $cpp -override -retain <<-'EOF' #ifdef COLOR *Foreground: black *Background: #cdd2b4 @@ -193,9 +209,8 @@ XConsole*geometry: 480x130+0-0 #endif EOF -fi -if test "$kdm" = "yes" -o "$gdm" = "yes" ; then - $xrdb -nocpp -override -retain ${ETCDIR}/Xresources +else + $xrdb $cpp -override -retain ${ETCDIR}/Xresources fi # @@ -234,6 +249,11 @@ fi # +# No xconsole for kdm/gdm case +# +test "$xdm" = "no" && exit 0 + +# # Only for display :0 we have to set up the xconsole to be # sure that the system messages are visible. # @@ -243,13 +263,6 @@ esac # -# No xconsole for kdm/gdm case -# -if test "$kdm" = "yes" -o "$gdm" = "yes" ; then - exit 0 -fi - -# # The geometry of xconsole is set in the Xresource file. # ( ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org