From 22d0b9b14b7256e952d929e5ee2bbf75ed23b8b6 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Sun, 31 Aug 2003 21:16:09 +0000
Subject: [PATCH] fixed gdm (needs yet another style of session generation)
 (#43)

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1269 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/CHANGELOG-RENE |  2 ++
 package/gnome2/gdm24/gdm.cron           | 22 ++++++++++++++--------
 package/gnome2/gdm24/gdm24.conf         |  8 +-------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE
index b62cd2f91..a3b480d2d 100644
--- a/Documentation/Developers/CHANGELOG-RENE
+++ b/Documentation/Developers/CHANGELOG-RENE
@@ -6,6 +6,8 @@
             packed files
  - Sebastian Jaenicke: updated sysvinit and e2fsprogs
  - mod_install improvements (#122 and #133)
+ - added vim default config
+ - fixed gdm (needs yet another style of session generation) (#43)
 
 *) 2003-08-30 (2.0.0-rc1 - 2.0.0-rc2)
 
diff --git a/package/gnome2/gdm24/gdm.cron b/package/gnome2/gdm24/gdm.cron
index 35410f8c6..6a34a8649 100755
--- a/package/gnome2/gdm24/gdm.cron
+++ b/package/gnome2/gdm24/gdm.cron
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 echo "Removing all old gdm sessions scripts ..."
-# except Xsession
-rm -fv /etc/opt/gnome2/gdm/Sessions/[a-z,A-W,Y,Z]*
+# we should not delete Default
+rm -fv /etc/opt/gnome2/dm/Sessions/[a-z]*
 
 echo "Creating gdm session scripts from ROCK wm registry ..."
 for x in /usr/share/rock-registry/wm/* ; do
@@ -11,11 +11,17 @@ for x in /usr/share/rock-registry/wm/* ; do
 	short="`basename $x`"
 	echo "  $name ($short) ..."
 
-	# create the session script for the template-session created
-	# during the ROCK Linux build of gdm
-	sed -e "s,yyyy,$short," -e "s,zzzz,$exec," \
-		/etc/opt/gnome2/gdm/template-session > \
-		"/etc/opt/gnome2/gdm/Sessions/$name"
-	chmod -v +x "/etc/opt/gnome2/gdm/Sessions/$name"
+	# create the .desktop file
+	cat > /etc/opt/gnome2/dm/Sessions/$short.desktop <<- EOT
+[Desktop Entry]
+Encoding=UTF-8
+Name=$short
+Comment=$name
+Exec=$exec
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
+EOT
+
 done
 
diff --git a/package/gnome2/gdm24/gdm24.conf b/package/gnome2/gdm24/gdm24.conf
index e0260c9c7..ec27f3f1e 100644
--- a/package/gnome2/gdm24/gdm24.conf
+++ b/package/gnome2/gdm24/gdm24.conf
@@ -32,13 +32,7 @@ gdm_pm() {
 	echo "Installing cron script ..."
 	cp -fv $confdir/gdm.cron $root/etc/cron.d/90-gdm
 	chmod +x $root/etc/cron.d/90-gdm
-
-	# create a template Session script for our cron script
-	sed -e "s/.gnomerc/xyyyyrc/" -e "s/\/gnomerc/yyyyrc/" \
-	    -e "s/command=\`.*/command="zzzz"/" \
-		$root/$sysconfdir/gdm/Sessions/Gnome > \
-		$root/$sysconfdir/gdm/template-session
 }
 
-var_append postinstall ' ' 'gdm_pm'
+hook_add postinstall 3 gdm_pm