From b25c1703b1114eeb259283b09e2da1a8c5c481660a9ec5999a3dcfbf19461dac Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 13 Feb 2019 15:55:40 +0000 Subject: [PATCH] - %post: get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager (boo#1125040) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=185 --- xdm.changes | 6 ++++++ xdm.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/xdm.changes b/xdm.changes index c91293a..083c106 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 13 15:47:45 UTC 2019 - sndirsch@suse.com + +- %post: get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager + (boo#1125040) + ------------------------------------------------------------------- Tue Dec 11 08:06:00 UTC 2018 - msrb@suse.com diff --git a/xdm.spec b/xdm.spec index 678b23c..f0630da 100644 --- a/xdm.spec +++ b/xdm.spec @@ -1,7 +1,7 @@ # # spec file for package xdm # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -224,6 +224,8 @@ touch %{buildroot}%{_libexecdir}/X11/displaymanagers/console default-displaymanager %{_libexecdir}/X11/displaymanagers/console 5 %{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \ default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm 10 +# get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager (boo#1125040) +sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %endif %if 0%{?suse_version} > 1320 %firewalld_reload