From dc86cb3707acee748deb0d5353c5e3ec01961257e2a93dabaa403c48b38d6b0e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Tue, 23 Jan 2007 20:25:59 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=3

---
 gdm.changes |  5 +++++
 gdm.spec    | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/gdm.changes b/gdm.changes
index 6b15be7..43fda06 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 23 15:06:50 CET 2007 - sbrabec@suse.cz
+
+- Update /etc/init.d/xdm on older products.
+
 -------------------------------------------------------------------
 Thu Jan  4 15:47:47 CET 2007 - sbrabec@suse.cz
 
diff --git a/gdm.spec b/gdm.spec
index 0a0acab..1eb8101 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -22,7 +22,7 @@ License:        GNU General Public License (GPL)
 Group:          System/GUI/GNOME
 Autoreqprov:    on
 Version:        2.16.1
-Release:        49
+Release:        50
 Summary:        The GNOME 2.x Display Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        gdm.pamd
@@ -166,11 +166,19 @@ rm -f etc/gdm/gdm_sysconfig.conf
 /usr/sbin/useradd -r -o -g gdm -s /bin/false \
 -c "Gnome Display Manager daemon" -d /var/lib/gdm gdm 2> /dev/null || :
 /usr/sbin/usermod -g gdm -G gdm -s /bin/false gdm 2> /dev/null
-%if %suse_version <1010
+%if %suse_version <= 1020
 
 %post
+%if %suse_version < 1010
 %{fillup_only -n displaymanager -s gdm}
 %{fillup_and_insserv -npY displaymanager earlygdm}
+%endif
+sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/init.d/xdm
+
+%triggerin -- xorg-x11
+sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/init.d/xdm
+%endif
+%if %suse_version < 1010
 
 %postun
 %insserv_cleanup
@@ -214,6 +222,8 @@ rm -f etc/gdm/gdm_sysconfig.conf
 %dir /usr/share/xsessions
 
 %changelog -n gdm
+* Tue Jan 23 2007 - sbrabec@suse.cz
+- Update /etc/init.d/xdm on older products.
 * Thu Jan 04 2007 - sbrabec@suse.cz
 - All references to /opt/gnome moved to /usr.
 - Spec file cleanup.