From 9d4d40fb197fdecaab51b0ee759661e3563b281dc4983f116c3182d31b4e66a2 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 23 Mar 2016 13:09:40 +0000
Subject: [PATCH] Accepting request 378393 from GNOME:Next

Update to 3.20.0

OBS-URL: https://build.opensuse.org/request/show/378393
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=310
---
 gdm-3.19.92.tar.xz             |  3 ---
 gdm-3.20.0.tar.xz              |  3 +++
 gdm-workaround-boo971852.patch | 14 ++++++++++++++
 gdm.changes                    | 14 ++++++++++++++
 gdm.spec                       |  9 +++++++--
 5 files changed, 38 insertions(+), 5 deletions(-)
 delete mode 100644 gdm-3.19.92.tar.xz
 create mode 100644 gdm-3.20.0.tar.xz
 create mode 100644 gdm-workaround-boo971852.patch

diff --git a/gdm-3.19.92.tar.xz b/gdm-3.19.92.tar.xz
deleted file mode 100644
index 1c24b16..0000000
--- a/gdm-3.19.92.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1dc1db49ecdde10ebbb277cbf1afbe88fa01ba3600811658ae40805ef47aed3b
-size 1107556
diff --git a/gdm-3.20.0.tar.xz b/gdm-3.20.0.tar.xz
new file mode 100644
index 0000000..3521199
--- /dev/null
+++ b/gdm-3.20.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c64fba0bb07a86504bc8cb877fd529938c1cc931b6ff1cbca0e99b4a24d9d3c2
+size 1107872
diff --git a/gdm-workaround-boo971852.patch b/gdm-workaround-boo971852.patch
new file mode 100644
index 0000000..9697e28
--- /dev/null
+++ b/gdm-workaround-boo971852.patch
@@ -0,0 +1,14 @@
+Index: gdm-3.19.92/libgdm/gdm-sessions.c
+===================================================================
+--- gdm-3.19.92.orig/libgdm/gdm-sessions.c
++++ gdm-3.19.92/libgdm/gdm-sessions.c
+@@ -171,6 +171,9 @@ collect_sessions_from_directory (const c
+                 if (! g_str_has_suffix (filename, ".desktop")) {
+                         continue;
+                 }
++                if (! g_strcmp0 (filename, "xsession.desktop")) {
++                        continue;
++                }
+                 id = g_strndup (filename, strlen (filename) - strlen (".desktop"));
+ 
+                 full_path = g_build_filename (dirname, filename, NULL);
diff --git a/gdm.changes b/gdm.changes
index b4dd8d0..1dfd142 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Mar 23 08:28:11 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 3.20.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Mar 21 18:45:10 UTC 2016 - zaitor@opensuse.org
+
+- Add gdm-workaround-boo971852.patch: Workaround decision to show
+  a basic xsession to all users as a workaround for non-working
+  DEs. A user of gdm always has a working gnome-shell installed, or
+  gdm itself would not work.
+
 -------------------------------------------------------------------
 Wed Mar 16 08:50:13 UTC 2016 - zaitor@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index c5d4fb4..0793d1d 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -25,13 +25,13 @@
 %define enable_split_authentication 0
 
 Name:           gdm
-Version:        3.19.92
+Version:        3.20.0
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            http://projects.gnome.org/gdm/
-Source:         http://download.gnome.org/sources/gdm/3.19/%{name}-%{version}.tar.xz
+Source:         http://download.gnome.org/sources/gdm/3.20/%{name}-%{version}.tar.xz
 Source1:        gdm.pamd
 Source2:        gdm-autologin.pamd
 Source3:        gdm-launch-environment.pamd
@@ -43,6 +43,8 @@ Source4:        gdmflexiserver-wrapper
 Source5:        X11-displaymanager-gdm
 # GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script
 Source8:        autogen.sh
+# PATCH-FEATURE-OPENSUSE gdm-workaround-boo971852.patch zaitor@opensuse.org -- Work around boo971852 - xsessions is just not going to happen for a gdm user - Those users ALL have gnome-shell installed (which is mandatory for gdm to operate) - openSUSE only
+Patch0:         gdm-workaround-boo971852.patch
 # PATCH-NEEDS-REBASE PATCH-FIX-OPENSUSE gdm-desktop-session-env-pam.patch bnc427744 vuntz@novell.com -- Sets a PAM environment variable to let the pam gnome-keyring module know which session is started
 Patch6:         gdm-desktop-session-env-pam.patch
 # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts
@@ -178,6 +180,9 @@ running display manager.
 %setup -q
 cp %{S:8} .
 translation-update-upstream
+%if 0%{?is_opensuse}
+%patch0 -p1
+%endif
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1