From e2f9e64b7194e1fdfe982e0dcc17b7be277c89648756511bd06bd30e5058279d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 24 Jul 2017 10:31:12 +0000 Subject: [PATCH] Accepting request 512187 from home:zhangxiaofei:branches:GNOME:Factory - Add gdm-default-wm-sle12.patch: + Set the default/fallback session type to SLE Classic (bnc#881659). - Sync SLE history about gdm-standalone-xdmcp-server.patch OBS-URL: https://build.opensuse.org/request/show/512187 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=343 --- gdm-default-wm-sle12.patch | 13 +++++++++++++ gdm.changes | 11 ++++++++++- gdm.spec | 5 +++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gdm-default-wm-sle12.patch diff --git a/gdm-default-wm-sle12.patch b/gdm-default-wm-sle12.patch new file mode 100644 index 0000000..5df7cb3 --- /dev/null +++ b/gdm-default-wm-sle12.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c +index ad25135..2f27451 100644 +--- a/daemon/gdm-session.c ++++ b/daemon/gdm-session.c +@@ -551,7 +551,7 @@ get_fallback_session_name (GdmSession *self) + } + g_free (name); + +- name = g_strdup ("gnome"); ++ name = g_strdup ("sle-classic"); + if (get_session_command_for_name (self, name, NULL)) { + g_free (self->priv->fallback_session_name); + self->priv->fallback_session_name = name; diff --git a/gdm.changes b/gdm.changes index e5e963a..4be93a8 100644 --- a/gdm.changes +++ b/gdm.changes @@ -620,6 +620,13 @@ Sun Sep 7 10:03:41 UTC 2014 - zaitor@opensuse.org + Misc fixes. + Updated translations. +------------------------------------------------------------------- +Wed Jul 2 06:07:06 UTC 2014 - cxiong@suse.com + +- Add gdm-default-wm-sle12.patch: + + Set the default/fallback session type to SLE Classic + (bnc#881659). + ------------------------------------------------------------------- Fri Jun 27 16:43:48 UTC 2014 - fcrozat@suse.com @@ -743,7 +750,8 @@ Mon Dec 16 23:07:35 UTC 2013 - dimstar@opensuse.org Thu Nov 28 20:50:00 UTC 2013 - dimstar@opensuse.org - Update to version 3.11.2: - + XDMCP fixes. + + XDMCP fixes (bgo#567522). + - Drop gdm-standalone-xdmcp-server.patch. + BSD portability fixes. + Assorted changes to build goop. + Updated translations. @@ -763,6 +771,7 @@ Wed Nov 27 19:52:01 UTC 2013 - fcrozat@suse.com fix leak of gdm-launch-environment (bnc#871808, bgo#729727). - Add gdm-slave-fix-infinite-loop-on-shutdown.patch: fix infinite loop on shutdown (bnc#871808, bgo#712767). +- Add gdm-standalone-xdmcp-server.patch (bgo#567522). ------------------------------------------------------------------- Wed Nov 27 19:52:01 UTC 2013 - dliang@suse.com diff --git a/gdm.spec b/gdm.spec index d865444..81d84ff 100644 --- a/gdm.spec +++ b/gdm.spec @@ -60,6 +60,8 @@ Patch35: gdm-xauthlocalhostname.patch Patch41: gdm-plymouth-vt1.patch # PATCH-FIX-UPSTREAM gdm-fails-to-restart-gnome-shell.patch bsc#981976 bgo#769969 tyang@suse.com -- Gdm should stop after a few times fails Patch42: gdm-fails-to-restart-gnome-shell.patch +# PATCH-FIX-SLE gdm-default-wm-sle12.patch bnc#881659 cxiong@suse.com -- set default/fallback session type to SLE Classic +Patch49: gdm-default-wm-sle12.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -191,6 +193,9 @@ translation-update-upstream %patch35 -p1 %patch41 -p1 %patch42 -p1 +%if !0%{?is_opensuse} +%patch49 -p1 +%endif %build NOCONFIGURE=1 sh autogen.sh