From 59156946a859cc19b1acee9122d203436f059c1a3f76b8ec4200cde5030e59c0 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 9 Mar 2018 17:05:32 +0000
Subject: [PATCH 1/2] - check for available graphics during runtime instead of
 %post,   since %post may already run during image building time in our  
 buildsystem (boo#1039497)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=168
---
 xdm.changes | 7 +++++++
 xdm.spec    | 8 --------
 xdm.tar.bz2 | 4 ++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/xdm.changes b/xdm.changes
index 040df54..ed6fca3 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar  9 16:46:58 UTC 2018 - sndirsch@suse.com
+
+- check for available graphics during runtime instead of %post,
+  since %post may already run during image building time in our
+  buildsystem (boo#1039497)
+
 -------------------------------------------------------------------
 Mon Feb 26 19:24:04 UTC 2018 - sndirsch@suse.com
 
diff --git a/xdm.spec b/xdm.spec
index 8b07951..6790a22 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -217,14 +217,6 @@ touch %{buildroot}%{_libexecdir}/X11/displaymanagers/console
 %service_add_post display-manager.service
 %{fillup_only -n displaymanager}
 %endif
-# Do no try to start Xserver on platforms which may ship without
-# graphics card (bsc#1039497)
-%ifarch aarch64 ppc64le
-if ! [ -c /dev/fb* -o -d /dev/dri ]; then
-    sed -i -e "s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
-              %{_sysconfdir}/sysconfig/displaymanager
-fi
-%endif
 %if 0%{?suse_version} >= 1330
 %{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \
   default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5
diff --git a/xdm.tar.bz2 b/xdm.tar.bz2
index b1ace0e..11b839e 100644
--- a/xdm.tar.bz2
+++ b/xdm.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5358018905e24cd25d161bf97d61b0a247fb8a2fe14a4f8318c97cf6a81aab2c
-size 23875
+oid sha256:555f89ea66078c531dbf8d27bb44a07452580b88de2f21bf7580149d4d8b41b3
+size 24065

From 458a489f77574c38ff64323fc93777ee6dfb5dac523de40e8e9d8be055a1078b Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 9 Mar 2018 17:24:57 +0000
Subject: [PATCH 2/2] fixed build

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=169
---
 xdm.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xdm.spec b/xdm.spec
index 6790a22..58365f9 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -160,6 +160,7 @@ rmdir usr/lib/firewalld
 %endif
 %if 0%{?suse_version} >= 1330
 patch -p1 < %{PATCH2}
+rm -f usr/lib/X11/display-manager.orig
 %endif
 %if "%{_fillupdir}" != "/var/adm/fillup-templates"
   mkdir -p %{buildroot}$(dirname %{_fillupdir})