From 06199955655c71fd8d1dd4b0d7f8ba7f27ea5845d209410fffc8a9bafca67a66 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Fri, 13 Oct 2017 07:14:42 +0000
Subject: [PATCH] Accepting request 533707 from GNOME:Next

Resubmit, with bug ref added

OBS-URL: https://build.opensuse.org/request/show/533707
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=356
---
 gdm.changes |  9 +++++++++
 gdm.spec    | 14 ++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/gdm.changes b/gdm.changes
index 2402a7d..5c6deaa 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Oct 12 08:55:56 UTC 2017 - dimstar@opensuse.org
+
+- Have update-alternatives handle Xinit's integration of the
+  displaymanager, replacing /etc/sysconfig/displaymanager
+  (boo#1053863).
+- Drop usage of glib2_gsettings_schema_* and icon_theme_cache_*
+  scriptlets, since this is handled by file triggers now.
+
 -------------------------------------------------------------------
 Wed Oct  4 16:30:20 UTC 2017 - dimstar@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index d982854..92baf5d 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -272,6 +272,10 @@ mv $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver $RPM_BUILD_ROOT%{_libexecdir}/gdm/gd
 install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/gdmflexiserver
 #Install /etc/xinit.d/xdm integration script
 install -D -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/X11/displaymanagers/gdm
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
+ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager
+
 # Install other files
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/gdm
 mkdir -p $RPM_BUILD_ROOT/run/gdm
@@ -311,16 +315,16 @@ if test -f /sbin/conf.d/SuSEconfig.gdm; then
 fi
 
 %post
-%glib2_gsettings_schema_post
-%icon_theme_cache_post
+%{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \
+  default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm 25
 
 %posttrans
 # Create dconf database for gdm, to lockdown the gdm session
 dconf update
 
 %postun
-%glib2_gsettings_schema_postun
-%icon_theme_cache_postun
+[ -f %{_libexecdir}/X11/displaymanagers/gdm ] || %{_sbindir}/update-alternatives \
+  --remove default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm
 
 %post -n libgdm1 -p /sbin/ldconfig
 
@@ -362,7 +366,9 @@ dconf update
 %config %{_sysconfdir}/dbus-1/system.d/gdm.conf
 # /etc/xinit.d/xdm integration
 %dir %{_libexecdir}/X11/displaymanagers
+%{_libexecdir}/X11/displaymanagers/default-displaymanager
 %{_libexecdir}/X11/displaymanagers/gdm
+%ghost %{_sysconfdir}/alternatives/default-displaymanager
 
 %files -n libgdm1
 %defattr(-,root,root)