Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Fri Aug 21 16:26:22 CEST 2009. -------- --- xorg-x11/xorg-x11.changes 2009-08-11 17:45:50.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2009-08-20 11:09:04.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Aug 20 10:55:46 CEST 2009 - sndirsch@suse.de + +- xrestop.tar.gz --> xrestop.tar.bz2 so it gets built, installed + and eventually packaged; needs ncurses-devel (bnc #532741) + +------------------------------------------------------------------- +Wed Aug 19 12:13:31 CEST 2009 - sndirsch@suse.de + +- /etc/init.d/xdm + * added support for SLIM login manager (bnc #531667) + +------------------------------------------------------------------- +Tue Aug 18 14:40:43 CEST 2009 - tiwai@suse.de + +- add missing ConsoleKit-devel to buildrequires + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xrestop-0.4.tar.gz New: ---- xrestop-0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.2yTQ3p/_old 2009-08-21 16:23:51.000000000 +0200 +++ /var/tmp/diff_new_pack.2yTQ3p/_new 2009-08-21 16:23:51.000000000 +0200 @@ -20,13 +20,13 @@ Name: xorg-x11 %define mcpp 0 -BuildRequires: 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 +BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libpng-devel ncurses-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 %if %mcpp BuildRequires: mcpp %endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 27 +Release: 28 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -136,7 +136,7 @@ Source96: xbacklight-1.1.tar.bz2 Source97: xinput-1.4.2.tar.bz2 Source98: xcompmgr-1.1.4.tar.bz2 -Source99: xrestop-0.4.tar.gz +Source99: xrestop-0.4.tar.bz2 Source200: misc.tar.bz2 Source201: twm.tar.bz2 Source202: xdm.tar.bz2 ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2009-05-18 15:33:43.000000000 +0200 +++ new/etc/init.d/xdm 2009-08-19 12:11:44.000000000 +0200 @@ -15,8 +15,8 @@ # Provides: xdm # Required-Start: $remote_fs # Required-Stop: $remote_fs -# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlykdm winbind acpid -# Should-Stop: ypbind $syslog gpm firstboot kbd resmgr earlykdm winbind acpid +# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid +# Should-Stop: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid # Default-Start: 5 # Default-Stop: # Description: X Display Manager @@ -67,6 +67,7 @@ XDM_PIDFILE="/var/run/xdm.pid" KDM_PIDFILE="/var/run/kdm.pid" GDM_PIDFILE="/var/run/gdm.pid" +SLIM_PIDFILE="/var/run/slim.lock" PIDFILE=$XDM_PIDFILE KDEROOTHOME=/root/.kdm export KDEROOTHOME @@ -84,9 +85,12 @@ KDM_BIN=/opt/kde3/bin/kdm KDM4_BIN=/usr/bin/kdm WDM_BIN=/usr/bin/wdm +SLIM_BIN=/usr/bin/slim RELOADSIGNAL="-HUP" -case "${DISPLAYMANAGER##*/}" in +DM=${DISPLAYMANAGER##*/} + +case "${DM}" in kdm3) DISPLAYMANAGER=$KDM_BIN PIDFILE=$KDM_PIDFILE ;; @@ -107,6 +111,10 @@ ;; wdm|WDM) DISPLAYMANAGER=$WDM_BIN ;; + slim|SLIM) DISPLAYMANAGER=$SLIM_BIN + XDMOPTIONS=-d + PIDFILE=$SLIM_PIDFILE + ;; console) exit 0 ;; *) DISPLAYMANAGER=$XDM_BIN @@ -121,12 +129,10 @@ esac test ! -x "$DISPLAYMANAGER" && DISPLAYMANAGER=$XDM_BIN -DM=${DISPLAYMANAGER##*/} - rc_reset case "$1" in start) - # Avoid duplicated messages when earlykdm is in use + # Avoid duplicated messages when earlyxdm is in use if [ "$DISPLAYMANAGER" = "$KDM_BIN" -a -s $KDM_PIDFILE ]; then /sbin/checkproc -p $KDM_PIDFILE $KDM_BIN && rc_exit 0 elif [ "$DISPLAYMANAGER" = "$KDM4_BIN" -a -s $KDM_PIDFILE ]; then @@ -197,24 +203,36 @@ chown root:tty /dev/xconsole /dev/tty0 chmod 622 /dev/xconsole /dev/tty0 fi + else + case "${DM}" in + slim|SLIM) + test -s $PIDFILE || pgrep -f $DISPLAYMANAGER > $PIDFILE + esac fi rc_status -v ;; stop) # make sure to stop the running one (Bug #306035) - if test -s $KDM_PIDFILE; then + if test -s "$KDM_PIDFILE"; then PIDFILE=$KDM_PIDFILE - elif test -s $GDM_PIDFILE; then + elif test -s "$GDM_PIDFILE"; then PIDFILE=$GDM_PIDFILE - elif test -s $XDM_PIDFILE; then + elif test -s "$XDM_PIDFILE"; then PIDFILE=$XDM_PIDFILE + elif test -s "$SLIM_PIDFILE"; then + PIDFILE=$SLIM_PIDFILE fi - if test -f $PIDFILE; then - PID=$(cat $PIDFILE) - DISPLAYMANAGER=$(ps -p $PID -o command h | cut -d' ' -f1) + if test -s $PIDFILE; then + read -t 1 PID < $PIDFILE + if CHECKDM=$(ps ho command= -p $PID) ; then + DISPLAYMANAGER=${CHECKDM%%[[:blank:]]*} + DM=${DISPLAYMANAGER##*/} + fi + unset CHECKDM + else + rm -f $PIDFILE + unset PIDFILE fi - DM=${DISPLAYMANAGER##*/} - echo -n "Shutting down service $DM" # @@ -222,7 +240,7 @@ # SIGKILL if xdm does not terminate within # - killproc -p $PIDFILE -TERM $DISPLAYMANAGER + killproc ${PIDFILE:+"-p ${PIDFILE}"} -TERM $DISPLAYMANAGER rc_status -v ;; restart) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org