rpms/openbox/devel openbox-3.4.10-gnomesession.patch, 1.1, 1.2 openbox.spec, 1.49, 1.50

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12846

Modified Files:
	openbox-3.4.10-gnomesession.patch openbox.spec 
Log Message:
- fix gnome-session script again (#552760)


openbox-3.4.10-gnomesession.patch:
 b/data/xsession/openbox-gnome-session.in              |    2 +-
 openbox-3.4.10/data/xsession/openbox-gnome-session.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: openbox-3.4.10-gnomesession.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/openbox-3.4.10-gnomesession.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openbox-3.4.10-gnomesession.patch	18 Jan 2010 11:10:39 -0000	1.1
+++ openbox-3.4.10-gnomesession.patch	21 Jan 2010 13:37:36 -0000	1.2
@@ -17,3 +17,15 @@ index 6765ae8..1f17edb 100644
        # if openbox isn't in the session then append it
        SESSION="${SESSION%]},openbox]"
    fi
+diff -up openbox-3.4.10/data/xsession/openbox-gnome-session.in.gnomesession2 openbox-3.4.10/data/xsession/openbox-gnome-session.in
+--- openbox-3.4.10/data/xsession/openbox-gnome-session.in.gnomesession2	2010-01-21 14:30:07.000000000 +0100
++++ openbox-3.4.10/data/xsession/openbox-gnome-session.in	2010-01-21 14:30:47.000000000 +0100
+@@ -37,7 +37,7 @@ else
+   if test -z "$SESSION"; then
+       # if its empty then just run openbox
+       SESSION="[openbox]"
+-  elif 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


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/devel/openbox.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- openbox.spec	18 Jan 2010 11:10:39 -0000	1.49
+++ openbox.spec	21 Jan 2010 13:37:37 -0000	1.50
@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.4.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -150,6 +150,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jan 21 2010 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.10-3
+- fix gnome-session script again (#552760)
+
 * Mon Jan 18 2010 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.10-2
 - fix crash when window is added to focus order while focus cycling
 - fix gnome-session script