From 667b3e6bf47a89948bd2d22966e61b6e13e5935ed2fed9ffe584752987e1ec83 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 23 Nov 2017 15:08:11 +0000
Subject: [PATCH] Accepting request 544820 from
 home:RBrownSUSE:branches:X11:XOrg

Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544820
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=154
---
 xdm.changes | 6 ++++++
 xdm.spec    | 9 +++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/xdm.changes b/xdm.changes
index 9830a13..a7593e8 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:52:48 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Thu Nov 23 10:46:29 UTC 2017 - sndirsch@suse.com
 
diff --git a/xdm.spec b/xdm.spec
index 6c09b3e..6394242 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -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
@@ -149,7 +154,7 @@ tar xf %{SOURCE3}
 %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 +271,7 @@ fi
 %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