From 83d1ec3cc2efc9bd1552e6bd2dd3bac0e772a2669d869e2278baa080ca2390d6 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 24 Jul 2017 14:23:57 +0000 Subject: [PATCH] - %post * make previous change in /etc/sysconfig/displaymanager instead of /var/adm/fillup-templates/sysconfig.displaymanager OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=145 --- xdm.changes | 7 +++++++ xdm.spec | 16 ++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/xdm.changes b/xdm.changes index 754e6f3..4c81fd4 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 24 14:21:45 UTC 2017 - sndirsch@suse.com + +- %post + * make previous change in /etc/sysconfig/displaymanager instead + of /var/adm/fillup-templates/sysconfig.displaymanager + ------------------------------------------------------------------- Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com diff --git a/xdm.spec b/xdm.spec index 31435c4..c77dbc3 100644 --- a/xdm.spec +++ b/xdm.spec @@ -173,20 +173,20 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm %endif %post -# 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" \ - var/adm/fillup-templates/sysconfig.displaymanager -fi -%endif %if 0%{?suse_version} < 1315 %{fillup_and_insserv -Y xdm} %else %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" \ + /etc/sysconfig/displaymanager +fi +%endif %pre %if !0%{?suse_version} < 1315