From a9767808278dd74512b64cab7cdb9cf7803cbb491479a0e6456373f3f4702d6f Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 5 Oct 2020 14:55:27 +0000
Subject: [PATCH] Accepting request 839553 from
 home:Vogtinator:branches:X11:XOrg

Now build tested

- Don't create the compat symlinks in /etc on the fly, track them
  properly as %config

OBS-URL: https://build.opensuse.org/request/show/839553
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=224
---
 xdm-tarball.patch | 12 ++----------
 xdm.changes       |  6 ++++++
 xdm.spec          | 12 +++++++++---
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/xdm-tarball.patch b/xdm-tarball.patch
index de45712..c887ec7 100644
--- a/xdm-tarball.patch
+++ b/xdm-tarball.patch
@@ -301,22 +301,14 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager
          /bin/logger
  	return 0
      fi
-@@ -130,6 +133,20 @@
+@@ -130,6 +133,12 @@
  	exit 0
  	;;
      *)
 +	test -d /etc/X11/xdm || mkdir -p /etc/X11/xdm
-+	# SUSEconfig edits these files appropriate to /etc/sysconfig/displaymanager
++	# SUSEconfig.xdm edits these files appropriate to /etc/sysconfig/displaymanager
 +	test -r /etc/X11/xdm/xdm-config   || cp $DMDIR/xdm-config /etc/X11/xdm/xdm-config
 +	test -r /etc/X11/xdm/Xservers     || cp $DMDIR/Xservers   /etc/X11/xdm/Xservers
-+	# needed by sddm
-+	test -r /etc/X11/xdm/Xsession     || ln -snf $DMDIR/Xsession     /etc/X11/xdm/Xsession
-+	test -r /etc/X11/xdm/Xsetup       || ln -snf $DMDIR/Xsetup       /etc/X11/xdm/Xsetup
-+	# needed by lightdm
-+	test -r /etc/X11/xdm/Xstartup     || ln -snf $DMDIR/Xstartup     /etc/X11/xdm/Xstartup
-+	test -r /etc/X11/xdm/Xreset       || ln -snf $DMDIR/Xreset       /etc/X11/xdm/Xreset
-+	# possibly needed by who knows ...
-+	test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map
 +	# still often sourced by old ~/.xinitrc or ~/.xsession user files ...
 +	test -r /etc/X11/xinit/xinitrc.common || ln -snf /usr/etc/X11/xinit/xinitrc.common /etc/X11/xinit/xinitrc.common
  	for i in  /usr/lib/X11/displaymanagers/*
diff --git a/xdm.changes b/xdm.changes
index ddd0c18..82efd84 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Oct  4 09:40:50 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Don't create the compat symlinks in /etc on the fly, track them
+  properly as %config
+
 -------------------------------------------------------------------
 Sat Oct  3 16:52:18 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xdm.spec b/xdm.spec
index 2fef02a..dc0d7b3 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -124,8 +124,15 @@ tar xf %{SOURCE1}
 patch -p0 < %{PATCH2}
 mkdir -p usr/etc/X11/xdm
 mv etc/X11/xdm/* usr/etc/X11/xdm
+# Install compatibility symlinks. Remove once DMs adjusted
+for i in Xsession Xsetup Xstartup Xreset Keyboard.map; do
+	ln -s /usr/etc/X11/xdm/$i etc/X11/xdm/$i
+done
+# Edited by SUSEConfig.xdm, package a copy
+for i in xdm-config Xservers; do
+	cp usr/etc/X11/xdm/$i etc/X11/xdm/$i
+done
 mv etc/pam.d usr/etc/
-rmdir etc/X11/xdm etc/X11
 %else
 patch -p0 < %{PATCH4}
 %endif
@@ -207,9 +214,8 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
 %if 0%{?UsrEtcMove}
 %dir %{_distconfdir}/X11
 %{_distconfdir}/X11/xdm/
-%else
-%config %{_sysconfdir}/X11/xdm/
 %endif
+%config %{_sysconfdir}/X11/xdm/
 %if 0%{?UsrEtcMove}
 %dir %{_distconfdir}/X11/xdm/scripts
 %else