Make xsession stuff work - at least on Fedora.

SVN revision: 30257

e16.spec.in

@@ -48,6 +48,8 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
 rm -f $RPM_BUILD_ROOT/usr/lib/libe16_*.a
 rm -f $RPM_BUILD_ROOT/usr/lib/libe16_*.la
+mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/Xclients.d
+cp $RPM_BUILD_ROOT/usr/share/e16/misc/Xclients.* $RPM_BUILD_ROOT/etc/X11/xinit/Xclients.d/
 
 %clean
 test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
@@ -60,6 +62,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/*
 %{_datadir}/locale/*
 %{_datadir}/xsessions/*
+%{_sysconfdir}/X11/xinit/Xclients.d/*
 #%{_mandir}/*
 
 %changelog

misc/E-GNOME

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/X11/xdm/Xsession e-gnome

misc/E-KDE

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/X11/xdm/Xsession e-kde

misc/E16

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /etc/X11/xdm/Xsession e16

misc/Makefile.am

@@ -1,15 +1,20 @@
 DESKTOPS = e16.desktop e16-gnome.desktop e16-kde.desktop
 DESKTOPS_IN = e16.desktop.in e16-gnome.desktop.in e16-kde.desktop.in
-XCLIENTS = Xclients.e16 Xclients.e-gnome Xclients.e-kde
-SESSIONS = E16 E-GNOME E-KDE
+XCLIENTS = Xclients.e16.sh Xclients.e16-gnome.sh Xclients.e16-kde.sh
 STARTUP = starte16
 ICONS = e16.png
 
-misc_DATA = $(DESKTOPS) $(XCLIENTS) $(SESSIONS) $(SCRIPTS) $(ICONS)
-sesm_DATA = e16.desktop
 bin_SCRIPTS = starte16
 
-EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SESSIONS) $(SCRIPTS) $(ICONS)
-
 miscdir = $(ENLIGHTENMENT_ROOT)/misc
-sesmdir = $(datadir)/xsessions
+misc_DATA = $(ICONS) $(DESKTOPS)
+misc_SCRIPTS = $(XCLIENTS)
+
+xsessiondir = $(datadir)/xsessions
+xsession_DATA = $(DESKTOPS)
+
+# Is this Fedora only stuff?
+#xclientsdir = $(sysconfdir)/X11/xinit/Xclients.d
+#xclients_SCRIPTS = $(XCLIENTS)
+
+EXTRA_DIST = $(DESKTOPS_IN) $(SCRIPTS) $(ICONS)

misc/Xclients.e-gnome

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec starte16 GNOME

misc/Xclients.e-kde

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec starte16 KDE

misc/Xclients.e16-gnome.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec starte16 gnome

misc/Xclients.e16-kde.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec starte16 kde

misc/e16-gnome.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=XSession
 Name=E-GNOME
 Comment=This session starts GNOME using enlightenment (e16) as window manager
-Exec=starte16 GNOME
+Exec=e16-gnome
 Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
-Type=Application

misc/e16-kde.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=XSession
 Name=E-KDE
 Comment=This session starts KDE using enlightenment (e16) as window manager
-Exec=starte16 KDE
+Exec=e16-kde
 Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
-Type=Application

misc/e16.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=XSession
 Name=E16
 Comment=This session starts the Enlightenment (e16) window manager
-Exec=starte16
+Exec=e16
 Icon=@ENLIGHTENMENT_ROOT@/misc/e16.png
-Type=Application

misc/starte16

@@ -1,10 +1,10 @@
 #!/bin/sh
 case "$1" in
-GNOME)
+gnome|GNOME)
 	export WINDOW_MANAGER=e16
 	exec gnome-session
 	;;
-KDE)
+kde|KDE)
 	export KDEWM=e16
 	exec startkde
 	;;