From 0ca30caa2ce284e407c5a1f1326c6e59a9807bec Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Jan 14 2011 17:08:54 +0000
Subject: add support for new gnome-session (#669391)


---

diff --git a/openbox-3.4.11.2-gnomesession.patch b/openbox-3.4.11.2-gnomesession.patch
new file mode 100644
index 0000000..82d0ab4
--- /dev/null
+++ b/openbox-3.4.11.2-gnomesession.patch
@@ -0,0 +1,21 @@
+diff -up openbox-3.4.11.2/data/xsession/openbox-gnome-session.in.gnome openbox-3.4.11.2/data/xsession/openbox-gnome-session.in
+--- openbox-3.4.11.2/data/xsession/openbox-gnome-session.in.gnome	2010-03-14 15:40:37.000000000 +0100
++++ openbox-3.4.11.2/data/xsession/openbox-gnome-session.in	2011-01-14 17:15:18.738710496 +0100
+@@ -24,7 +24,7 @@ if test $MAJOR -lt 2 || (test $MAJOR = 2
+   # old gnome-session was easy to work with
+   export WINDOW_MANAGER="@bindir@/openbox"
+   exec gnome-session --choose-session=openbox-session "$@"
+-else
++elif test $MAJOR = 2 && test $MINOR -lt 91; then
+   # new gnome-session requires openbox to be set in gconf and an
+   # openbox.desktop to be installed in the applications directory
+ 
+@@ -54,6 +54,8 @@ else
+ 
+   # run GNOME/Openbox
+   exec gnome-session --default-session-key $SPATH/openbox_session "$@"
++else
++  exec gnome-session --session=gnome-openbox "$@"
+ fi
+ 
+ 
diff --git a/openbox.gnome-session b/openbox.gnome-session
new file mode 100644
index 0000000..ed1a01c
--- /dev/null
+++ b/openbox.gnome-session
@@ -0,0 +1,6 @@
+[GNOME Session]
+Required=windowmanager;panel;filemanager;
+Required-windowmanager=openbox
+Required-panel=gnome-panel
+Required-filemanager=nautilus
+DefaultApps=gnome-settings-daemon;
diff --git a/openbox.spec b/openbox.spec
index 62fef84..98909a8 100644
--- a/openbox.spec
+++ b/openbox.spec
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.4.11.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -12,9 +12,11 @@ Source2:	xdg-menu
 Source3:	menu.xml
 Source4:	openbox.desktop
 Source5:	terminals.menu
+Source6:	openbox.gnome-session
 
 Patch0:		openbox-3.4.9-autostartdir.patch
 Patch1:		openbox-3.4.11-Xau.patch
+Patch2:		openbox-3.4.11.2-gnomesession.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +77,7 @@ The %{name}-libs package contains shared libraries used by %{name}.
 %setup -q
 %patch0 -p1 -b .autostartdir
 %patch1 -p1 -b .Xau
+%patch2 -p1 -b .gnome
 %patch4 -p1 -b .24bit
 
 
@@ -102,6 +105,8 @@ desktop-file-install --vendor="" \
         %{SOURCE4}
 
 install -m644 -p %{SOURCE5} %{buildroot}%{_datadir}/%{name}/terminals.menu
+install -D %{SOURCE6} \
+	%{buildroot}%{_datadir}/gnome-session/sessions/gnome-openbox.session
 
 %find_lang %{name}
 rm -f %{buildroot}%{_libdir}/*.la
@@ -128,6 +133,7 @@ rm -rf %{buildroot}
 %{_datadir}/themes/*/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome/wm-properties/
+%{_datadir}/gnome-session/sessions/
 %{_datadir}/xsessions/%{name}*.desktop
 %{_mandir}/man1/%{name}*.1*
 %{_mandir}/man1/obxprop.1*
@@ -153,6 +159,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 14 2011 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.11.2-6
+- add support for new gnome-session (#669391)
+
 * Wed Sep 29 2010 jkeating - 3.4.11.2-5
 - Rebuilt for gcc bug 634757