From a71fbe34ad79906c5565df9d4681a4c67edf9bf2bb258e1bc37a2e818dcf9ce0 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 28 Sep 2017 12:09:02 +0000
Subject: [PATCH] Accepting request 529093 from
 home:xiaoguang_wang:branches:GNOME:Factory

- Add gdm-ignore-SLE-CLASSIC-MODE.patch: Ignore env
  SLE_CLASSIC_MODE variable when switching from sle-classic session
  to gnome-classic session (bsc#1060630).

OBS-URL: https://build.opensuse.org/request/show/529093
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=352
---
 gdm-ignore-SLE-CLASSIC-MODE.patch | 24 ++++++++++++++++++++++++
 gdm.changes                       |  7 +++++++
 gdm.spec                          |  3 +++
 3 files changed, 34 insertions(+)
 create mode 100644 gdm-ignore-SLE-CLASSIC-MODE.patch

diff --git a/gdm-ignore-SLE-CLASSIC-MODE.patch b/gdm-ignore-SLE-CLASSIC-MODE.patch
new file mode 100644
index 0000000..2d514bd
--- /dev/null
+++ b/gdm-ignore-SLE-CLASSIC-MODE.patch
@@ -0,0 +1,24 @@
+diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c
+index b648e9de..eee31724 100644
+--- a/daemon/gdm-wayland-session.c
++++ b/daemon/gdm-wayland-session.c
+@@ -285,6 +285,7 @@ spawn_session (State        *state,
+                                                     "WAYLAND_DISPLAY",
+                                                     "WAYLAND_SOCKET",
+                                                     "GNOME_SHELL_SESSION_MODE",
++                                                    "SLE_CLASSIC_MODE",
+                                                     NULL };
+ 
+         g_debug ("Running wayland session");
+diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
+index 88fe96f4..c60ae04f 100644
+--- a/daemon/gdm-x-session.c
++++ b/daemon/gdm-x-session.c
+@@ -610,6 +610,7 @@ spawn_session (State        *state,
+                                                      "WAYLAND_DISPLAY",
+                                                      "WAYLAND_SOCKET",
+                                                      "GNOME_SHELL_SESSION_MODE",
++                                                     "SLE_CLASSIC_MODE",
+                                                      NULL };
+ 
+         g_debug ("Running X session");
diff --git a/gdm.changes b/gdm.changes
index 6945ad6..97dc1db 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Sep 28 07:33:15 UTC 2017 - xwang@suse.com
+
+- Add gdm-ignore-SLE-CLASSIC-MODE.patch: Ignore env
+  SLE_CLASSIC_MODE variable when switching from sle-classic session
+  to gnome-classic session (bsc#1060630).
+
 -------------------------------------------------------------------
 Mon Sep 18 12:29:08 UTC 2017 - fcrozat@suse.com
 
diff --git a/gdm.spec b/gdm.spec
index bf6aa12..0340bf8 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -64,6 +64,8 @@ Patch42:        gdm-fails-to-restart-gnome-shell.patch
 Patch49:        gdm-default-wm-sle12.patch
 # PATCH-FIX-UPSTREAM gdm-check-for-Xwayland.patch bgo#787837 fcrozat@suse.com -- Don't try Wayland if Xwayland isn't installed
 Patch50:        gdm-check-for-Xwayland.patch
+# PATCH-FIX-SLE gdm-ignore-SLE-CLASSIC-MODE.patch bsc#1060630 xwang@suse.com -- ignore env SLE_CLASSIC_MODE variable when switching from sle-classic session to gnome-classic session
+Patch51:        gdm-ignore-SLE-CLASSIC-MODE.patch
 BuildRequires:  check-devel
 # needed for directory ownership
 BuildRequires:  dconf
@@ -203,6 +205,7 @@ translation-update-upstream
 %patch42 -p1
 %if !0%{?is_opensuse}
 %patch49 -p1
+%patch51 -p1
 %endif
 %patch50 -p1