From ecb4fcae54d5deb1071798fd11a6a1e6bacde5cf8f2f3c4a5cc58521a6d8cbf8 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 15 Apr 2019 08:33:25 +0000
Subject: [PATCH] Merge alarrosa's changes

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=424
---
 gdm.changes  |  8 ++++++++
 gdm.spec     | 19 +++++++++++++------
 gdm.tmpfiles |  4 ++++
 3 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 gdm.tmpfiles

diff --git a/gdm.changes b/gdm.changes
index 18b1def..8f87c31 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jan 30 16:04:12 UTC 2019 - alarrosa@suse.com
+
+- Add gdm.tmpfiles to create directories under /var with
+  systemd-tmpfiles in order to support transactional updates.
+- Mark directories under /var as %ghost so they're not created
+  during package installation (related to boo#1098063, fate#325524)
+
 -------------------------------------------------------------------
 Tue Jul 31 12:43:52 UTC 2018 - bwiedemann@suse.com
 
diff --git a/gdm.spec b/gdm.spec
index 6f929d4..41169f4 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gdm
 #
-# 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
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -38,6 +38,8 @@ Source6:        gdmflexiserver-wrapper
 Source7:        X11-displaymanager-gdm
 # GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script
 Source8:        autogen.sh
+# Use tmpfiles to create directories under /var to support transactional updates
+Source9:        gdm.tmpfiles
 # PATCH-FIX-UPSTREAM gdm-disable-wayland-on-unsupported-chipsets.patch bgo#789081 bgo#794106 boo#1059356 boo#1083609 boo#1088539 fezhang@suse.com -- Disable Wayland on unsupported chipsets
 Patch1:         gdm-disable-wayland-on-unsupported-chipsets.patch
 # WARNING: do not remove/significantly change patch3 without updating the relevant patch in accountsservice too
@@ -273,10 +275,13 @@ touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
 ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}%{_libexecdir}/X11/displaymanagers/default-displaymanager
 
 # Install other files
-mkdir -p %{buildroot}%{_localstatedir}/log/gdm
 mkdir -p %{buildroot}/run/gdm
 mkdir -p %{buildroot}%{_bindir}
 ln -s ../sbin/gdm %{buildroot}%{_bindir}/gdm
+
+mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
+install -m 644 %{SOURCE9} %{buildroot}%{_prefix}/lib/tmpfiles.d/gdm.conf
+
 %find_lang %{name} %{?no_lang_C}
 %fdupes -s %{buildroot}%{_datadir}/help
 
@@ -309,6 +314,7 @@ if test -f /sbin/conf.d/SuSEconfig.gdm; then
 fi
 
 %post
+%tmpfiles_create gdm.conf
 %{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \
   default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm 25
 
@@ -344,9 +350,9 @@ dconf update
 %dir %{_libexecdir}/gdm
 %{_libexecdir}/gdm/gdm-*
 %{_libexecdir}/gdm/gdmflexiserver
-%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm
-%attr(711,root,gdm) %dir %{_localstatedir}/log/gdm
-%dir %{_localstatedir}/cache/gdm
+%ghost %attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm
+%ghost %attr(711,root,gdm) %dir %{_localstatedir}/log/gdm
+%ghost %dir %{_localstatedir}/cache/gdm
 %ghost %attr(711,root,gdm) %dir /run/gdm
 %config %{_sysconfdir}/pam.d/gdm
 %config %{_sysconfdir}/pam.d/gdm-autologin
@@ -363,6 +369,7 @@ dconf update
 %{_libexecdir}/X11/displaymanagers/gdm
 %ghost %{_sysconfdir}/alternatives/default-displaymanager
 %{_udevrulesdir}/61-gdm.rules
+%{_libexecdir}/tmpfiles.d/gdm.conf
 
 %files -n libgdm1
 %{_libdir}/libgdm.so.*
diff --git a/gdm.tmpfiles b/gdm.tmpfiles
new file mode 100644
index 0000000..1993160
--- /dev/null
+++ b/gdm.tmpfiles
@@ -0,0 +1,4 @@
++d /var/lib/gdm/ 0750 gdm gdm -
++d /var/log/gdm/ 0711 root gdm -
++d /var/cache/gdm/ 1755 root root -
+