diff --git a/openbox-3.4.10-gnomesession.patch b/openbox-3.4.10-gnomesession.patch index 98a90d9..ff338f2 100644 --- a/openbox-3.4.10-gnomesession.patch +++ b/openbox-3.4.10-gnomesession.patch @@ -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 diff --git a/openbox.spec b/openbox.spec index 41170e2..86dbb5b 100644 --- a/openbox.spec +++ b/openbox.spec @@ -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 - 3.4.10-3 +- fix gnome-session script again (#552760) + * Mon Jan 18 2010 Miroslav Lichvar - 3.4.10-2 - fix crash when window is added to focus order while focus cycling - fix gnome-session script