From 24f4be344b2fe21130284894272548741c845156c012650495430b5feb2e0c9b Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 1 Apr 2010 10:33:31 +0000
Subject: [PATCH] Updating link to change in openSUSE:Factory/gdm revision 92.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=c0f3ab2d1b79b72efcb4bf87ce836c8d
---
 gdm-2.29.92.tar.bz2     |  3 ---
 gdm-2.30.0.tar.bz2      |  3 +++
 gdm-suse-xsession.patch | 36 ++++++++++++++++++++++++------------
 gdm.changes             | 13 +++++++++++++
 gdm.spec                |  4 ++--
 5 files changed, 42 insertions(+), 17 deletions(-)
 delete mode 100644 gdm-2.29.92.tar.bz2
 create mode 100644 gdm-2.30.0.tar.bz2

diff --git a/gdm-2.29.92.tar.bz2 b/gdm-2.29.92.tar.bz2
deleted file mode 100644
index ccbb71c..0000000
--- a/gdm-2.29.92.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:604e30596f9bf52b42822707ba2ce16a0c6b5c79fd5c9448463eee1803f431e8
-size 2324565
diff --git a/gdm-2.30.0.tar.bz2 b/gdm-2.30.0.tar.bz2
new file mode 100644
index 0000000..767f09d
--- /dev/null
+++ b/gdm-2.30.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15
+size 2291133
diff --git a/gdm-suse-xsession.patch b/gdm-suse-xsession.patch
index b8b73c4..776d7b1 100644
--- a/gdm-suse-xsession.patch
+++ b/gdm-suse-xsession.patch
@@ -1,7 +1,7 @@
-Index: gdm-2.29.5/data/Init.in
+Index: gdm-2.29.92/data/Init.in
 ===================================================================
---- gdm-2.29.5.orig/data/Init.in
-+++ gdm-2.29.5/data/Init.in
+--- gdm-2.29.92.orig/data/Init.in
++++ gdm-2.29.92/data/Init.in
 @@ -1,4 +1,9 @@
  #!/bin/sh
 +
@@ -12,10 +12,10 @@ Index: gdm-2.29.5/data/Init.in
  # Stolen from the debian kdm setup, aren't I sneaky
  # Plus a lot of fun stuff added
  #  -George
-Index: gdm-2.29.5/data/PostSession.in
+Index: gdm-2.29.92/data/PostSession.in
 ===================================================================
---- gdm-2.29.5.orig/data/PostSession.in
-+++ gdm-2.29.5/data/PostSession.in
+--- gdm-2.29.92.orig/data/PostSession.in
++++ gdm-2.29.92/data/PostSession.in
 @@ -1,3 +1,7 @@
  #!/bin/sh
  
@@ -24,18 +24,30 @@ Index: gdm-2.29.5/data/PostSession.in
 +fi
 +
  exit 0
-Index: gdm-2.29.5/data/Xsession.in
+Index: gdm-2.29.92/data/Xsession.in
 ===================================================================
---- gdm-2.29.5.orig/data/Xsession.in
-+++ gdm-2.29.5/data/Xsession.in
-@@ -1,4 +1,10 @@
+--- gdm-2.29.92.orig/data/Xsession.in
++++ gdm-2.29.92/data/Xsession.in
+@@ -1,4 +1,9 @@
  #!@XSESSION_SHELL@
 +
-+if test -f /etc/X11/xdm/Xstartup -a -x /etc/X11/xdm/Xsession; then
-+       /bin/bash /etc/X11/xdm/Xstartup
++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-2.29.92/data/PreSession.in
+===================================================================
+--- gdm-2.29.92.orig/data/PreSession.in
++++ gdm-2.29.92/data/PreSession.in
+@@ -6,4 +6,8 @@
+ #
+ # 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
++fi
++
+ PATH="@X_PATH@:$PATH"
diff --git a/gdm.changes b/gdm.changes
index 98eca5f..f2586b4 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Mar 30 01:43:33 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.30.0:
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sun Mar 28 16:43:57 CEST 2010 - vuntz@opensuse.org
+
+- Call /etc/X11/xdm/Xstartup from /etc/gdm/PreSession/Default
+  instead of from /etc/gdm/Xsession. This should fix some
+  permission issue. Fix bnc#573669.
+
 -------------------------------------------------------------------
 Tue Mar  9 01:54:09 CET 2010 - dimstar@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 7b55075..ddeeb22 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gdm (Version 2.29.92)
+# spec file for package gdm (Version 2.30.0)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -41,7 +41,7 @@ BuildRequires:  xorg-x11-server-extra
 BuildRequires:  zenity
 License:        GPLv2+
 Group:          System/GUI/GNOME
-Version:        2.29.92
+Version:        2.30.0
 Release:        1
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2