- Clean up properties after gdm in session scripts (#444135)

- Add license to xdg-menu script

openbox-3.4.7.2-gdm.patch

@@ -0,0 +1,39 @@
+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
+@@ -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 KDE with Openbox as its window manager
+ export KDEWM="@bindir@/openbox"
+ exec startkde "$@"
+diff -up openbox-3.4.7.2/data/xsession/openbox-session.in.gdm openbox-3.4.7.2/data/xsession/openbox-session.in
+--- openbox-3.4.7.2/data/xsession/openbox-session.in.gdm	2008-02-29 22:18:12.000000000 +0100
++++ openbox-3.4.7.2/data/xsession/openbox-session.in	2008-06-10 18:37:54.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
++
+ AUTOSTART="$HOME/.config/openbox/autostart.sh"
+ GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
+ 

openbox.spec

@@ -1,6 +1,6 @@
 Name:		openbox
 Version:	3.4.7.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@ Source2:	xdg-menu
 Source3:	menu.xml
 
 Patch0:		openbox-3.4.7.1-autostartdir.patch
+Patch1:		openbox-3.4.7.2-gdm.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,6 +66,7 @@ The %{name}-libs package contains shared libraries used by %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .autostartdir
+%patch1 -p1 -b .gdm
 
 
 %build
@@ -132,6 +134,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jun 10 2008 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.7.2-3
+- Clean up properties after gdm in session scripts (#444135)
+- Add license to xdg-menu script
+
 * Tue May 20 2008 Miroslav Lichvar <mlichvar@redhat.com> - 3.4.7.2-2
 - Drop numdesks patch (#444135)
 

xdg-menu

@@ -1,4 +1,23 @@
 #!/usr/bin/env python
+#
+# Copyright (C) 2008  Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author(s): Luke Macken <lmacken@redhat.com>
+#            Miroslav Lichvar <mlichvar@redhat.com>
+
 
 import gmenu, sys
 from xml.sax.saxutils import escape