Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2017-11-30 12:38:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm" Thu Nov 30 12:38:14 2017 rev:63 rq:545302 version:1.1.11 Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2017-11-03 16:21:38.667211259 +0100 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2017-11-30 12:38:15.665473338 +0100 @@ -1,0 +2,18 @@ +Thu Nov 23 20:20:50 UTC 2017 - [email protected] + +- move /var/adm/fillup-templates/sysconfig.displaymanager + to %_fillupdir on TW and sle15/Leap 15 + +------------------------------------------------------------------- +Thu Nov 23 13:52:48 UTC 2017 - [email protected] + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- +Thu Nov 23 10:46:29 UTC 2017 - [email protected] + +- xdm.tar.bz2: Fix Xstartup, that couldn't handle env DISPLAY=(null) + (bsc#1068016, patch by [email protected]) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.spec ++++++ --- /var/tmp/diff_new_pack.vwoRPz/_old 2017-11-30 12:38:16.441445121 +0100 +++ /var/tmp/diff_new_pack.vwoRPz/_new 2017-11-30 12:38:16.441445121 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %define _dminitdir %{_libexecdir}/X11/displaymanagers %if 0%{?suse_version} > 1230 %define with_systemd 1 @@ -143,13 +148,19 @@ %if 0%{?suse_version} >= 1330 patch -p1 < %{PATCH2} %endif +%if "%{_fillupdir}" != "/var/adm/fillup-templates" + mkdir -p %{buildroot}$(dirname %{_fillupdir}) + mv %{buildroot}/var/adm/fillup-templates \ + %{buildroot}$(dirname %{_fillupdir}) +%endif + %if %dm_fallbacks tar xf %{SOURCE3} %endif %ifarch s390 s390x sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\"+g" \ -e "s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \ - var/adm/fillup-templates/sysconfig.displaymanager + %{buildroot}%{_fillupdir}/sysconfig.displaymanager %endif popd @@ -266,7 +277,7 @@ %config(noreplace) %{_sysconfdir}/pam.d/xdm %config(noreplace) %{_sysconfdir}/pam.d/xdm-np %dir %{_localstatedir}/lib/xdm/ -%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager +%{_fillupdir}/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors %{_bindir}/chooser ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup --- old/etc/X11/xdm/Xstartup 2014-12-15 19:34:46.000000000 +0100 +++ new/etc/X11/xdm/Xstartup 2017-11-23 11:42:33.091615000 +0100 @@ -54,6 +54,9 @@ # # Find out if this is a local or remote connection # +if test $DISPLAY == '(null)' ; then + DISPLAY="" +fi LOCATION=${DISPLAY%:*} LINE=:${DISPLAY#*:} if test -z "$LOCATION" ; then
