- Drop gnome session script (gnome-session no longer supports

$WINDOW_MANAGER)
- Add application desktop file to allow starting openbox in gnome-session
    when configured in gconf

openbox-3.4.7.2-gdm.patch

@@ -1,16 +1,3 @@
-diff -up openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gdm openbox-3.4.7.2/data/xsession/openbox-gnome-session.in
---- openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gdm	2008-02-29 22:18:12.000000000 +0100
-+++ openbox-3.4.7.2/data/xsession/openbox-gnome-session.in	2008-06-10 18:37:10.000000000 +0200
-@@ -7,6 +7,9 @@ if test -n "$1"; then
-   exit
- fi
- 
-+# Clean up after GDM
-+xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
-+
- # Run GNOME with Openbox as its window manager
- export WINDOW_MANAGER="@bindir@/openbox"
- exec gnome-session --choose-session=openbox-session "$@"
 diff -up openbox-3.4.7.2/data/xsession/openbox-kde-session.in.gdm openbox-3.4.7.2/data/xsession/openbox-kde-session.in
 --- openbox-3.4.7.2/data/xsession/openbox-kde-session.in.gdm	2008-02-29 22:18:12.000000000 +0100
 +++ openbox-3.4.7.2/data/xsession/openbox-kde-session.in	2008-06-10 18:37:26.000000000 +0200

openbox-3.4.7.2-gnomesession.patch

@@ -1,9 +0,0 @@
-diff -up openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.7.2/data/xsession/openbox-gnome-session.in
---- openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession	2008-09-04 16:48:21.000000000 +0200
-+++ openbox-3.4.7.2/data/xsession/openbox-gnome-session.in	2008-09-04 16:49:56.000000000 +0200
-@@ -12,4 +12,4 @@ xprop -root -remove _NET_NUMBER_OF_DESKT
- 
- # Run GNOME with Openbox as its window manager
- export WINDOW_MANAGER="@bindir@/openbox"
--exec gnome-session --choose-session=openbox-session "$@"
-+exec gnome-session "$@"

openbox.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Openbox
+Exec=openbox
+Icon=openbox
+NoDisplay=true
+X-GNOME-Autostart-Phase=WindowManager
+X-GNOME-Provides=windowmanager
+X-GNOME-Autostart-Notify=true

openbox.spec

@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.4.7.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -10,16 +10,17 @@ Source0:	http://icculus.org/openbox/releases/%{name}-%{version}.tar.gz
 Source1:	http://icculus.org/openbox/tools/setlayout.c
 Source2:	xdg-menu
 Source3:	menu.xml
+Source4:	openbox.desktop
 
 Patch0:		openbox-3.4.7.1-autostartdir.patch
 Patch1:		openbox-3.4.7.2-gdm.patch
-Patch2:		openbox-3.4.7.2-gnomesession.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{name}-libs = %{version}-%{release}
 
 BuildRequires:	gettext
+BuildRequires:	desktop-file-utils
 BuildRequires:	pango-devel
 BuildRequires:	startup-notification-devel
 BuildRequires:	libxml2-devel
@@ -68,7 +69,6 @@ The %{name}-libs package contains shared libraries used by %{name}.
 %setup -q
 %patch0 -p1 -b .autostartdir
 %patch1 -p1 -b .gdm
-%patch2 -p1 -b .gnomesession
 
 
 %build
@@ -90,9 +90,15 @@ install -p %{SOURCE2} %{buildroot}%{_datadir}/%{name}/xdg-menu
 sed 's|_XDGMENU_|%{_datadir}/%{name}/xdg-menu|g' < %{SOURCE3} \
 	> %{buildroot}%{_sysconfdir}/xdg/%{name}/menu.xml
 
+desktop-file-install --vendor="" \
+        --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+        %{SOURCE4}
+
 %find_lang %{name}
 rm -f %{buildroot}%{_libdir}/*.la
 rm -rf %{buildroot}%{_datadir}/doc/%{name}
+rm -f %{buildroot}%{_datadir}/xsessions/%{name}-gnome.desktop
+rm -f %{buildroot}%{_bindir}/%{name}-gnome-session
 
 
 %clean
@@ -109,9 +115,8 @@ rm -rf %{buildroot}
 %{_bindir}/gdm-control
 %{_bindir}/%{name}*
 %{_bindir}/setlayout
-%dir %{_datadir}/openbox
+%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/openbox/xdg-autostart
+%{_datadir}/%{name}
-%{_datadir}/openbox/xdg-menu
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/wm-properties/
@@ -136,6 +141,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Oct 02 2008 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.7.2-6
+- Drop gnome session script (gnome-session no longer supports $WINDOW_MANAGER)
+- Add application desktop file to allow starting openbox in gnome-session
+  when configured in gconf
+
 * Thu Sep 04 2008 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.7.2-5
 - Don't use --choose-session option in gnome session script