From 1dad7090c8d26fd6689ea39fbcf666be6f94b9bf76bd61e18ae6fc00748e3423 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 16 May 2008 12:16:23 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=48

---
 gdm-xdm-sessions.patch | 2 +-
 gdm.changes            | 6 ++++++
 gdm.spec               | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/gdm-xdm-sessions.patch b/gdm-xdm-sessions.patch
index 9dcc79d..6119f89 100644
--- a/gdm-xdm-sessions.patch
+++ b/gdm-xdm-sessions.patch
@@ -398,4 +398,4 @@
 -fi
 -
 -exec xterm -geometry 80x24+0+0
-+exec /etc/X11/xdm/Xsession $1 $GDM_LANG
++/bin/bash /etc/X11/xdm/Xstartup && exec /etc/X11/xdm/Xsession $1 $GDM_LANG
diff --git a/gdm.changes b/gdm.changes
index 79b704b..d5f2e4d 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 15 10:14:09 CEST 2008 - vuntz@suse.de
+
+- Update gdm-xdm-sessions.patch to run /etc/X11/xdm/Xstartup. Part
+  of bnc#368673.
+
 -------------------------------------------------------------------
 Wed Apr 16 13:21:17 CEST 2008 - sbrabec@suse.cz
 
diff --git a/gdm.spec b/gdm.spec
index 5afe0bb..3c07f45 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -23,7 +23,7 @@ PreReq:         %insserv_prereq
 License:        GPL v2 or later
 Group:          System/GUI/GNOME
 Version:        2.20.4
-Release:        9
+Release:        24
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
@@ -293,6 +293,9 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i
 %{_datadir}/gdm/*.conf
 
 %changelog
+* Thu May 15 2008 vuntz@suse.de
+- Update gdm-xdm-sessions.patch to run /etc/X11/xdm/Xstartup. Part
+  of bnc#368673.
 * Wed Apr 16 2008 sbrabec@suse.cz
 - Split package according to branding conventions (fate#301792).
 - Removed branding related changes from gdm-conf.patch.