Accepting request 36302 from GNOME:Factory

checked in (request 36302)

OBS-URL: https://build.opensuse.org/request/show/36302
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=121

gdm-2.29.92.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:604e30596f9bf52b42822707ba2ce16a0c6b5c79fd5c9448463eee1803f431e8
+size 2324565

gdm-2.30.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15
-size 2291133

gdm-suse-xsession.patch

@@ -1,7 +1,7 @@
-Index: gdm-2.29.92/data/Init.in
+Index: gdm-2.29.5/data/Init.in
 ===================================================================
---- gdm-2.29.92.orig/data/Init.in
-+++ gdm-2.29.92/data/Init.in
+--- gdm-2.29.5.orig/data/Init.in
++++ gdm-2.29.5/data/Init.in
 @@ -1,4 +1,9 @@
  #!/bin/sh
 +
@@ -12,10 +12,10 @@ Index: gdm-2.29.92/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.92/data/PostSession.in
+Index: gdm-2.29.5/data/PostSession.in
 ===================================================================
---- gdm-2.29.92.orig/data/PostSession.in
-+++ gdm-2.29.92/data/PostSession.in
+--- gdm-2.29.5.orig/data/PostSession.in
++++ gdm-2.29.5/data/PostSession.in
 @@ -1,3 +1,7 @@
  #!/bin/sh
  
@@ -24,30 +24,18 @@ Index: gdm-2.29.92/data/PostSession.in
 +fi
 +
  exit 0
-Index: gdm-2.29.92/data/Xsession.in
+Index: gdm-2.29.5/data/Xsession.in
 ===================================================================
---- gdm-2.29.92.orig/data/Xsession.in
-+++ gdm-2.29.92/data/Xsession.in
-@@ -1,4 +1,9 @@
+--- gdm-2.29.5.orig/data/Xsession.in
++++ gdm-2.29.5/data/Xsession.in
+@@ -1,4 +1,10 @@
  #!@XSESSION_SHELL@
 +
-+if test -x /etc/X11/xdm/Xsession; then
++if test -f /etc/X11/xdm/Xstartup -a -x /etc/X11/xdm/Xsession; then
++       /bin/bash /etc/X11/xdm/Xstartup
 +       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"

gdm.changes

@@ -1,16 +1,3 @@
--------------------------------------------------------------------
-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
 

gdm.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gdm (Version 2.30.0)
+# spec file for package gdm (Version 2.29.92)
 #
 # 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.30.0
+Version:        2.29.92
 Release:        1
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2