From 2b4591480eb6b118a87d04b5854cc5c7cb9c979c6be7776f05670638f697b2cb Mon Sep 17 00:00:00 2001
From: Yifan Jiang <yfjiang@suse.com>
Date: Wed, 21 Oct 2020 07:02:12 +0000
Subject: [PATCH] Accepting request 843130 from home:dimstar:Factory

Resubmit after tifan reviewed it

OBS-URL: https://build.opensuse.org/request/show/843130
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=464
---
 gdm-suse-xsession.patch | 66 +++++++++++++++++++++++------------------
 gdm.changes             |  6 ++++
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/gdm-suse-xsession.patch b/gdm-suse-xsession.patch
index b27ad83..df46f23 100644
--- a/gdm-suse-xsession.patch
+++ b/gdm-suse-xsession.patch
@@ -1,53 +1,61 @@
-Index: gdm-3.36.2/data/Init.in
-===================================================================
---- gdm-3.36.2.orig/data/Init.in
-+++ gdm-3.36.2/data/Init.in
-@@ -1,4 +1,9 @@
+diff --git a/data/Init.in b/data/Init.in
+index ec6fd395..4b8ed8ce 100644
+--- a/data/Init.in
++++ b/data/Init.in
+@@ -1,4 +1,11 @@
  #!/bin/sh
 +
 +if test -x /etc/X11/xdm/Xsetup; then
 +	exec /etc/X11/xdm/Xsetup
++elif test -x /usr/etc/X11/xdm/Xsetup; then
++       exec /usr/etc/X11/xdm/Xsetup
 +fi
 +
  # Stolen from the debian kdm setup, aren't I sneaky
  # Plus a lot of fun stuff added
  #  -George
-Index: gdm-3.36.2/data/PostSession.in
-===================================================================
---- gdm-3.36.2.orig/data/PostSession.in
-+++ gdm-3.36.2/data/PostSession.in
-@@ -1,3 +1,7 @@
+diff --git a/data/PostSession.in b/data/PostSession.in
+index c52d3c26..4d94b3e7 100755
+--- a/data/PostSession.in
++++ b/data/PostSession.in
+@@ -1,3 +1,9 @@
  #!/bin/sh
  
 +if test -x /etc/X11/xdm/Xreset; then
 +       exec /etc/X11/xdm/Xreset
++elif test -x /usr/etc/X11/xdm/Xreset; then
++       exec /usr/etc/X11/xdm/Xreset
 +fi
 +
  exit 0
-Index: gdm-3.36.2/data/Xsession.in
-===================================================================
---- gdm-3.36.2.orig/data/Xsession.in
-+++ gdm-3.36.2/data/Xsession.in
-@@ -1,4 +1,9 @@
- #!@XSESSION_SHELL@
-+
-+if test -x /etc/X11/xdm/Xsession; then
-+       exec /etc/X11/xdm/Xsession $1 $GDM_LANG
-+fi
-+
- #
- # This is SORT OF LIKE an X session, but not quite.  You get a command as the
- # first argument (it could be multiple words, so run it with "eval").  As a
-Index: gdm-3.36.2/data/PreSession.in
-===================================================================
---- gdm-3.36.2.orig/data/PreSession.in
-+++ gdm-3.36.2/data/PreSession.in
-@@ -6,4 +6,8 @@
+diff --git a/data/PreSession.in b/data/PreSession.in
+index cfabee75..306a905e 100755
+--- a/data/PreSession.in
++++ b/data/PreSession.in
+@@ -6,4 +6,10 @@
  #
  # Note that output goes into the .xsession-errors file for easy debugging
  #
 +if test -x /etc/X11/xdm/Xstartup; then
 +       exec /etc/X11/xdm/Xstartup
++elif test -x /usr/etc/X11/xdm/Xstartup; then
++       exec /usr/etc/X11/xdm/Xstartup
 +fi
 +
  PATH="@X_PATH@:$PATH"
+diff --git a/data/Xsession.in b/data/Xsession.in
+index 9d79558c..bcefdd73 100755
+--- a/data/Xsession.in
++++ b/data/Xsession.in
+@@ -1,4 +1,11 @@
+ #!@XSESSION_SHELL@
++
++if test -x /etc/X11/xdm/Xsession; then
++       exec /etc/X11/xdm/Xsession $1 $GDM_LANG
++elif test -x /usr/etc/X11/xdm/Xsession; then
++       exec /usr/etc/X11/xdm/Xsession $1 $GDM_LANG
++fi
++
+ #
+ # This is SORT OF LIKE an X session, but not quite.  You get a command as the
+ # first argument (it could be multiple words, so run it with "eval").  As a
diff --git a/gdm.changes b/gdm.changes
index aef9009..7fc6cfc 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 20 20:10:53 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update gdm-suse-xsession.patch: Handle the fact that xdm moved
+  its files from /etc to /usr/etc (boo#1177918).
+
 -------------------------------------------------------------------
 Wed Sep 16 09:17:43 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>