Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2015-08-10 09:14:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm" Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2015-03-18 13:08:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-08-10 09:14:20.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Jul 31 10:35:19 UTC 2015 - [email protected] + +- display-manager: don't try to kill DM if it's no longer running + (bsc#939843) + +------------------------------------------------------------------- +Wed Jul 29 12:48:28 UTC 2015 - [email protected] + +- Add some used programs to the requirement of xdm +- Use xli aka xsetbg if xpmroot is not available (hint from + [email protected]) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.spec ++++++ --- /var/tmp/diff_new_pack.G0iT8C/_old 2015-08-10 09:14:21.000000000 +0200 +++ /var/tmp/diff_new_pack.G0iT8C/_new 2015-08-10 09:14:21.000000000 +0200 @@ -76,7 +76,12 @@ Requires: /sbin/pidof Requires: logrotate Requires: sessreg +Requires: xconsole +Requires: xli +Requires: xmessage Requires: xrdb +Requires: xset +Requires: xsetroot %if 0%{?suse_version} > 1320 Requires: xterm-bin %else ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/RunChooser new/etc/X11/xdm/RunChooser --- old/etc/X11/xdm/RunChooser 2014-12-15 19:34:46.000000000 +0100 +++ new/etc/X11/xdm/RunChooser 2015-07-29 14:46:22.000000000 +0200 @@ -53,12 +53,14 @@ xkbmap=${BINDIR}/setxkbmap xkbcomp=${BINDIR}/xkbcomp xpmroot=${BINDIR}/xpmroot + xsetbg=${BINDIR}/xsetbg xsetroot=${BINDIR}/xsetroot kdmdesktop=/opt/kde/bin/kdmdesktop chooser=${BINDIR}/chooser xmessage=${BINDIR}/xmessage xrdb=${BINDIR}/xrdb backprg=${BINDIR}/BackGround + qiv=${BINDIR}/qiv # # Check if kdm is running and does its own background @@ -131,6 +133,10 @@ $xpmroot ${background}.gz elif test -s ${background} -a -x $xpmroot ; then $xpmroot $background +elif test -s ${background} -a -x $xsetbg ; then + $xsetbg $background +elif test -s ${background} -a -x $qiv ; then + $qiv -x $background elif test -x $backprg ; then $backprg else 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 2014-12-15 19:34:46.000000000 +0100 +++ new/etc/X11/xdm/Xsetup 2015-07-29 14:43:57.000000000 +0200 @@ -61,6 +61,7 @@ xkbmap=${BINDIR}/setxkbmap xkbcomp=${BINDIR}/xkbcomp xpmroot=${BINDIR}/xpmroot + xsetbg=${BINDIR}/xsetbg xsetroot=${BINDIR}/xsetroot xconsole=${BINDIR}/xconsole xmessage=${BINDIR}/xmessage @@ -138,6 +139,8 @@ $xpmroot ${background}.gz elif test -s ${background} -a -x $xpmroot ; then $xpmroot $background +elif test -s ${background} -a -x $xsetbg ; then + $xsetbg $background elif test -s ${background} -a -x $qiv ; then $qiv -x $background elif test -x $backprg ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/lib/X11/display-manager new/usr/lib/X11/display-manager --- old/usr/lib/X11/display-manager 2014-03-21 10:44:27.000000000 +0100 +++ new/usr/lib/X11/display-manager 2015-07-31 12:34:37.000000000 +0200 @@ -211,15 +211,14 @@ rm -f $PIDFILELNK fi - test -n "$DISPLAYMANAGER_BIN" && \ + if test -n "$DISPLAYMANAGER_BIN"; then echo -n "Shutting down service ${DISPLAYMANAGER_BIN##*/}" - - # - # killproc(8) sleep upto five seconds and sends - # SIGKILL if xdm does not terminate within - # - - killproc -p $PIDFILE -TERM $DISPLAYMANAGER_BIN + # + # killproc(8) sleep upto five seconds and sends + # SIGKILL if xdm does not terminate within + # + killproc -p $PIDFILE -TERM $DISPLAYMANAGER_BIN + fi rm -f $PIDFILELNK $PIDFILE rc_status -v ;;
