Hello community, here is the log from the commit of package xorg-x11 checked in at Mon Aug 21 18:19:01 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-08-21 17:23:33.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-08-21 17:58:24.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 21 17:57:03 CEST 2006 - sndirsch@suse.de + +- SuSEconfig.xdm: only rewrite config files and X symlink when + sysconfig file is more recent + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.NW6QiK/_old 2006-08-21 18:18:30.000000000 +0200 +++ /var/tmp/diff_new_pack.NW6QiK/_new 2006-08-21 18:18:30.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cpp fontconfig-devel freetype2-devel libpng-devel pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel URL: http://xorg.freedesktop.org/ Version: 7.1 -Release: 15 +Release: 16 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -411,6 +411,9 @@ %changelog -n xorg-x11 * Mon Aug 21 2006 - sndirsch@suse.de +- SuSEconfig.xdm: only rewrite config files and X symlink when + sysconfig file is more recent +* Mon Aug 21 2006 - sndirsch@suse.de - /etc/X11/xinit/xinitrc.common: * check for kde/startkde/fvwm2/wmlist also in /usr/bin, since these have moved for openSUSE >= 10.2 ++++++ suse-addons.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suse/SuSEconfig.xdm new/suse/SuSEconfig.xdm --- old/suse/SuSEconfig.xdm 2005-10-26 12:44:50.000000000 +0200 +++ new/suse/SuSEconfig.xdm 2006-08-21 17:55:02.000000000 +0200 @@ -23,6 +23,7 @@ . $r/lib/YaST/SuSEconfig.functions if test -r $r/etc/X11/xdm/Xservers; then + if test $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/Xservers; then file=$r/etc/X11/xdm/Xservers if test "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ; then sed "s/^(:[0-9][ \t]+local[ \t]+)/#\1/g" < $file > ${file}.tmp @@ -40,19 +41,23 @@ fi rm $file.tmp check_md5_and_move $file + fi fi -if test -n "$DISPLAYMANAGER_XSERVER" ; then +if test $r/etc/sysconfig/displaymanager -nt /var/X11R6/bin/X; then + if test -n "$DISPLAYMANAGER_XSERVER" ; then if test -f "/usr/X11R6/bin/$DISPLAYMANAGER_XSERVER" -a -x "/usr/X11R6/bin/$DISPLAYMANAGER_XSERVER" ; then ln -snf "/usr/X11R6/bin/$DISPLAYMANAGER_XSERVER" /var/X11R6/bin/X else ln -snf /usr/X11R6/bin/Xorg /var/X11R6/bin/X fi -else + else ln -snf /usr/X11R6/bin/Xorg /var/X11R6/bin/X + fi fi if test -r $r/etc/X11/xdm/xdm-config ; then + if test $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/xdm-config; then file=$r/etc/X11/xdm/xdm-config if test "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ; then sed "s/^(DisplayManager.requestPort:[ \t]+0)/!\1/g" < $file > ${file}.SuSEconfig @@ -63,6 +68,7 @@ else echo "${0##*/}: change of $file skipped" fi + fi fi # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org