- fix crash when window is added to focus order while focus cycling

- fix gnome-session script

.cvsignore

@@ -1,3 +1,2 @@
 setlayout.c
-openbox-3.4.9.tar.gz
 openbox-3.4.10.tar.gz

openbox-3.4.10-gnomesession.patch

@@ -0,0 +1,19 @@
+commit 62e36ad0410ce888e7097e7bce5cbbf67b5b6290
+Author: Dana Jansens <danakj@orodu.net>
+Date:   Tue Jan 12 13:59:25 2010 -0500
+
+    Fixes bug #4492 (mis-using the return value of grep -q in openbox-gnome-session script
+
+diff --git a/data/xsession/openbox-gnome-session.in b/data/xsession/openbox-gnome-session.in
+index 6765ae8..1f17edb 100644
+--- a/data/xsession/openbox-gnome-session.in
++++ b/data/xsession/openbox-gnome-session.in
+@@ -37,7 +37,7 @@ else
+   if test -z "$SESSION"; then
+       # if its empty then just run openbox
+       SESSION="[openbox]"
+-  elif test -z $(echo "$SESSION" | grep -q openbox); then
++  elif echo "$SESSION" | grep -q openbox; then
+       # if openbox isn't in the session then append it
+       SESSION="${SESSION%]},openbox]"
+   fi

openbox.spec

@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.4.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -14,6 +14,8 @@ Source4:	openbox.desktop
 
 Patch0:		openbox-3.4.9-autostartdir.patch
 Patch1:		openbox-3.4.10-obxpropman.patch
+Patch2:		openbox-3.4.10-focuscycle.patch
+Patch3:		openbox-3.4.10-gnomesession.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,6 +75,8 @@ The %{name}-libs package contains shared libraries used by %{name}.
 %setup -q
 %patch0 -p1 -b .autostartdir
 %patch1 -p1 -b .obxpropman
+%patch2 -p1 -b .focuscycle -F 2
+%patch3 -p1 -b .gnomesession
 %patch4 -p1 -b .24bit
 
 
@@ -146,6 +150,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 18 2010 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.10-2
+- fix crash when window is added to focus order while focus cycling
+- fix gnome-session script
+
 * Fri Jan 08 2010 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.10-1
 - Update to 3.4.10
 

sources

@@ -1,3 +1,2 @@
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
-2f30670f7067e3e17567019d2eef21a0  openbox-3.4.9.tar.gz
 daccf153c7808950313eb00bc250f9bc  openbox-3.4.10.tar.gz