From 4ae4b23521a326849cff3dc7a10a5d08e40bdfef7f325ab6e088cd2de8c4c6a3 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 8 Sep 2020 09:40:57 +0000
Subject: [PATCH] - reverted move to /usr/etc/X11/xdm for now due to
 boo#1176212

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=214
---
 xdm.changes |  5 +++++
 xdm.spec    | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/xdm.changes b/xdm.changes
index 62e617c..14293ba 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  8 09:29:10 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- reverted move to /usr/etc/X11/xdm for now due to boo#1176212
+
 -------------------------------------------------------------------
 Sat Sep  5 03:41:38 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xdm.spec b/xdm.spec
index 10b2cd9..882274b 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -16,6 +16,8 @@
 #
 
 
+%define UsrEtcMove 0
+
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir /var/adm/fillup-templates
@@ -102,7 +104,7 @@ autoreconf -fi
 %configure \
         --disable-static \
         --with-pam \
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
         --with-xdmconfigdir=%{_distconfdir}/X11/xdm \
         --with-xdmscriptdir=%{_distconfdir}/X11/xdm \
 %else
@@ -115,7 +117,7 @@ make %{?_smp_mflags}
 %install
 %make_install
 # Not used anymore by SuSE
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
 rm %{buildroot}%{_distconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
 %else
 rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
@@ -124,7 +126,7 @@ rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
 pushd %{buildroot}
 # SuSE default XDM configuration
 tar xf %{SOURCE1}
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
 patch -p0 < %{PATCH2}
 mkdir -p usr/etc/X11/xdm
 mv etc/X11/xdm/* usr/etc/X11/xdm
@@ -146,7 +148,7 @@ sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\
 popd
 
 # Correct location (FHS-2.1)
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
 ln -s %{_localstatedir}/lib/xdm/authdir %{buildroot}%{_distconfdir}/X11/xdm/authdir
 %else
 ln -s %{_localstatedir}/lib/xdm/authdir %{buildroot}%{_sysconfdir}/X11/xdm/authdir
@@ -207,13 +209,13 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
 %{_dminitdir}/console
 /usr/lib/X11/displaymanagers/default-displaymanager
 %ghost %{_sysconfdir}/alternatives/default-displaymanager
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
 %dir %{_distconfdir}/X11
 %{_distconfdir}/X11/xdm/
 %else
 %config %{_sysconfdir}/X11/xdm/
 %endif
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
 %dir %{_distconfdir}/X11/xdm/scripts
 %else
 %dir %{_sysconfdir}/X11/xdm/scripts
@@ -224,7 +226,7 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
 %{_unitdir}/display-manager.service
 /usr/lib/X11/display-manager
 %config %{_sysconfdir}/logrotate.d/xdm
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove}
 %{_distconfdir}/pam.d/xdm
 %{_distconfdir}/pam.d/xdm-np
 %else