Hello community, here is the log from the commit of package aaa_base checked in at Tue Jul 25 12:04:58 CEST 2006. -------- --- aaa_base/aaa_base.changes 2006-07-24 12:49:18.000000000 +0200 +++ aaa_base/aaa_base.changes 2006-07-25 11:25:32.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jul 25 09:51:48 CEST 2006 - sndirsch@suse.de + +- /etc/{profile,csh.login}: fixed $XKEYSYMDB/$XNLSPATH for X.Org 7 +- /etc/init.d/xdm: + * fixed init script for X.Org 7 + * cleanup + +------------------------------------------------------------------- +Tue Jul 25 10:43:49 CEST 2006 - schwab@suse.de + +- Fix last change. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.2a2p9d/_old 2006-07-25 12:04:35.000000000 +0200 +++ /var/tmp/diff_new_pack.2a2p9d/_new 2006-07-25 12:04:35.000000000 +0200 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv Autoreqprov: on Version: 10.1.1 -Release: 4 +Release: 5 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -148,6 +148,13 @@ %defattr(-,root,root) %changelog -n aaa_base +* Tue Jul 25 2006 - schwab@suse.de +- Fix last change. +* Tue Jul 25 2006 - sndirsch@suse.de +- /etc/{profile,csh.login}: fixed $XKEYSYMDB/$XNLSPATH for X.Org 7 +- /etc/init.d/xdm: + * fixed init script for X.Org 7 + * cleanup * Mon Jul 24 2006 - ro@suse.de - fixed RCCONFIG_BACKUP_DIR (move to /var/adm/backup/sysconfig) (#190597) ++++++ aaa_base.post ++++++ --- aaa_base/aaa_base.post 2006-07-24 12:53:11.000000000 +0200 +++ aaa_base/aaa_base.post 2006-07-25 11:23:20.000000000 +0200 @@ -140,7 +140,7 @@ && mv etc/sysconfig/shutdown.new etc/sysconfig/shutdown fi # fix sysconfig backup dir -if grep -q "RCCONFIG_BACKUP_DIR../var/adm/backup/rpmdb" ; then +if grep -q RCCONFIG_BACKUP_DIR../var/adm/backup/rpmdb etc/sysconfig/backup; then sed -e "s|^RCCONFIG_BACKUP_DIR=.*|RCCONFIG_BACKUP_DIR=\"/var/adm/backup/sysconfig\"|" \ etc/sysconfig/backup > etc/sysconfig/backup.new \ && mv etc/sysconfig/backup.new etc/sysconfig/backup ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/csh.login new/aaa_base/etc/csh.login --- old/aaa_base/etc/csh.login 2006-04-25 18:51:31.000000000 +0200 +++ new/aaa_base/etc/csh.login 2006-07-25 09:43:26.000000000 +0200 @@ -204,8 +204,16 @@ # These settings are recommended for old motif applications # if (! ${?CSHRCREAD} ) then - setenv XKEYSYMDB /usr/X11R6/lib/X11/XKeysymDB - setenv XNLSPATH /usr/X11R6/lib/X11/nls + if ( -r /usr/share/X11/XKeysymDB ) then + setenv XKEYSYMDB /usr/share/X11/XKeysymDB + else + setenv XKEYSYMDB /usr/X11R6/lib/X11/XKeysymDB + endif + if ( -d /usr/share/X11/nls ) then + setenv XNLSPATH /usr/share/X11/nls + else + setenv XNLSPATH /usr/X11R6/lib/X11/nls + endif endif if ( -s /etc/nntpserver ) then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/xdm new/aaa_base/etc/init.d/xdm --- old/aaa_base/etc/init.d/xdm 2006-04-23 16:58:44.000000000 +0200 +++ new/aaa_base/etc/init.d/xdm 2006-07-25 09:49:52.000000000 +0200 @@ -66,22 +66,19 @@ PIDFILE="/var/run/xdm.pid" KDEROOTHOME=/root/.kdm export KDEROOTHOME - - -if [ "$DISPLAYMANAGER_XSERVER" == "Xgl" -a -r /etc/X11/xorg.conf ]; then - cat /etc/X11/xorg.conf | tr "\t" " " | \ - grep -q -i -E '^ *Driver +"fglrx"' - if [ $? -eq 0 ]; then - /sbin/lsmod | grep -q fglrx || /sbin/modprobe fglrx &> /dev/null - fi - test -r /etc/profile.d/fglrx.sh && . /etc/profile.d/fglrx.sh +XDMDIR=/etc/X11/xdm +if [ -x /usr/bin/xdm ]; then + XDM_BIN=/usr/bin/xdm +else + XDM_BIN=/usr/X11R6/bin/xdm fi + case "${DISPLAYMANAGER##*/}" in kdm|kde|KDM|KDE) DISPLAYMANAGER=/opt/kde3/bin/kdm PIDFILE="/var/run/kdm.pid" ;; - xdm) DISPLAYMANAGER=/usr/X11R6/bin/xdm + xdm) DISPLAYMANAGER=$XDM_BIN ;; gdm|GDM|Gnome|GNOME) DISPLAYMANAGER=/opt/gnome/sbin/gdm PIDFILE="/var/run/gdm.pid" @@ -90,14 +87,14 @@ ;; console) exit 0 ;; - *) DISPLAYMANAGER=/usr/X11R6/bin/xdm + *) DISPLAYMANAGER=$XDM_BIN if test -x /opt/kde3/bin/kdm; then DISPLAYMANAGER=/opt/kde3/bin/kdm PIDFILE="/var/run/kdm.pid" fi ;; esac -test ! -x "$DISPLAYMANAGER" && DISPLAYMANAGER=/usr/X11R6/bin/xdm +test ! -x "$DISPLAYMANAGER" && DISPLAYMANAGER=$XDM_BIN DM=${DISPLAYMANAGER##*/} @@ -114,15 +111,11 @@ echo -n "Starting service $DM" # Don't start xdm if no Xserver is configured and xdm is not # configured for remote access - if [ ! -x /usr/X11R6/bin/X -a \ + if [ ! -x /usr/bin/X -a ! -x /usr/X11R6/bin/X -a \ "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ]; then rc_status -u rc_exit fi - if [ "$DISPLAYMANAGER" = "/usr/X11R6/bin/xdm" ]; then - ln -snf $PIDFILE /etc/X11/xdm/xdm-pid - ln -snf /var/log/xdm.errors /etc/X11/xdm/xdm-errors - fi if [ "$DISPLAYMANAGER" = "/opt/gnome/sbin/gdm" -a \ "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" -a \ "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ]; then @@ -132,8 +125,8 @@ # After a crash or a kill signal we may have # a wrong owner ship of /dev/xconsole if rc_status ; then - if test -x /etc/X11/xdm/TakeDevices ; then - /etc/X11/xdm/TakeDevices + if test -x $XDMDIR/TakeDevices ; then + $XDMDIR/TakeDevices else chown root:tty /dev/xconsole /dev/tty0 chmod 622 /dev/xconsole /dev/tty0 @@ -147,10 +140,6 @@ # killproc(8) sleep upto five seconds and sends # SIGKILL if xdm does not terminate within # - if [ "$DISPLAYMANAGER" = "/usr/X11R6/bin/xdm" ]; then - rm -f /etc/X11/xdm/xdm-pid - rm -f /etc/X11/xdm/xdm-errors - fi killproc -p $PIDFILE -TERM $DISPLAYMANAGER rc_status -v ;; @@ -170,7 +159,6 @@ rc_status -v ;; probe) - XDMDIR=/usr/X11R6/lib/X11/xdm if test $XDMDIR/xdm-config -nt $PIDFILE -o \ $XDMDIR/Xservers -nt $PIDFILE then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile new/aaa_base/etc/profile --- old/aaa_base/etc/profile 2006-04-25 18:51:48.000000000 +0200 +++ new/aaa_base/etc/profile 2006-07-25 09:31:01.000000000 +0200 @@ -226,10 +226,16 @@ # These settings are recommended for old motif applications # if test -z "$PROFILEREAD" ; then - XKEYSYMDB=/usr/X11R6/lib/X11/XKeysymDB - export XKEYSYMDB - XNLSPATH=/usr/X11R6/lib/X11/nls - export XNLSPATH + if [ -r /usr/share/X11/XKeysymDB ]; then + export XKEYSYMDB=/usr/share/X11/XKeysymDB + else + export XKEYSYMDB=/usr/X11R6/lib/X11/XKeysymDB + fi + if [ -d /usr/share/X11/nls ]; then + export XNLSPATH=/usr/share/X11/nls + else + export XNLSPATH=/usr/X11R6/lib/X11/nls + fi fi if test -s /etc/nntpserver ; then ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org