rpms/openbox/F-12 openbox-3.4.8-gdm.patch, NONE, 1.1 openbox-3.4.8-gnomesession.patch, NONE, 1.1 openbox-3.4.8-xdgautostart.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 openbox.spec, 1.44, 1.45 sources, 1.15, 1.16 openbox-3.4.7.2-gdm.patch, 1.3, NONE openbox-3.4.7.2-gnomesession.patch, 1.3, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11354

Modified Files:
	.cvsignore openbox.spec sources 
Added Files:
	openbox-3.4.8-gdm.patch openbox-3.4.8-gnomesession.patch 
	openbox-3.4.8-xdgautostart.patch 
Removed Files:
	openbox-3.4.7.2-gdm.patch openbox-3.4.7.2-gnomesession.patch 
Log Message:
- Update to 3.4.8
- Fix crash in xdg-autostart on desktop files with TryExec (#544006)


openbox-3.4.8-gdm.patch:
 openbox-gnome-session.in |    3 +++
 openbox-kde-session.in   |    3 +++
 openbox-session.in       |    3 +++
 3 files changed, 9 insertions(+)

--- NEW FILE openbox-3.4.8-gdm.patch ---
diff -up openbox-3.4.8/data/xsession/openbox-gnome-session.in.gdm openbox-3.4.8/data/xsession/openbox-gnome-session.in
--- openbox-3.4.8/data/xsession/openbox-gnome-session.in.gdm	2009-12-08 21:57:11.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-gnome-session.in	2009-12-10 14:06:27.000000000 +0100
@@ -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
+
 VER=$(gnome-session --version 2>/dev/null | \
       sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
 
diff -up openbox-3.4.8/data/xsession/openbox-kde-session.in.gdm openbox-3.4.8/data/xsession/openbox-kde-session.in
--- openbox-3.4.8/data/xsession/openbox-kde-session.in.gdm	2009-12-08 15:32:06.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-kde-session.in	2009-12-10 14:06:04.000000000 +0100
@@ -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.8/data/xsession/openbox-session.in.gdm openbox-3.4.8/data/xsession/openbox-session.in
--- openbox-3.4.8/data/xsession/openbox-session.in.gdm	2009-12-08 15:37:34.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-session.in	2009-12-10 14:06:49.000000000 +0100
@@ -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="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
 GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
 

openbox-3.4.8-gnomesession.patch:
 openbox-gnome-session.in |   30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

--- NEW FILE openbox-3.4.8-gnomesession.patch ---
diff -up openbox-3.4.8/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.8/data/xsession/openbox-gnome-session.in
--- openbox-3.4.8/data/xsession/openbox-gnome-session.in.gnomesession	2009-12-10 14:14:13.000000000 +0100
+++ openbox-3.4.8/data/xsession/openbox-gnome-session.in	2009-12-10 14:15:29.000000000 +0100
@@ -10,27 +10,13 @@ fi
 # Clean up after GDM
 xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
 
-VER=$(gnome-session --version 2>/dev/null | \
-      sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
-
-MAJOR=$(echo $VER | cut -d . -f 1)
-MINOR=$(echo $VER | cut -d . -f 2)
-
 # Run GNOME with Openbox as its window manager
-export WINDOW_MANAGER="@bindir@/openbox"
-
-if test $MAJOR -lt 2 || (test $MAJOR = 2 && test $MINOR -le 22); then
-  # old gnome-session allows multiple sessions to be saved
-  exec gnome-session --choose-session=openbox-session "$@"
-else
-  # make sure the gnome-wm script is being used
-  gconftool-2 -t string \
-      -s /desktop/gnome/session/required_components/windowmanager "gnome-wm" \
-      2> /dev/null
-
-  # new gnome-session does not allow multiple sessions
-  exec gnome-session "$@"
-fi
-
-
+SESSION=$(gconftool-2 -g /desktop/gnome/session/default_session 2> /dev/null)
+test -z "$SESSION" && SESSION="[openbox]"
+echo "$SESSION" | grep -q openbox || SESSION="${SESSION%]},openbox]"
+
+OPENBOX_SESSION=$(gconftool-2 -g /desktop/gnome/session/openbox_session 2> /dev/null)
+[ "$SESSION" != "$OPENBOX_SESSION" ] && gconftool-2 -t list --list-type=strings -s \
+  /desktop/gnome/session/openbox_session "$SESSION" 2> /dev/null
 
+exec gnome-session --default-session-key /desktop/gnome/session/openbox_session "$@"

openbox-3.4.8-xdgautostart.patch:
 xdg-autostart |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openbox-3.4.8-xdgautostart.patch ---
diff -up openbox-3.4.8/tools/xdg-autostart/xdg-autostart.xdgautostart openbox-3.4.8/tools/xdg-autostart/xdg-autostart
--- openbox-3.4.8/tools/xdg-autostart/xdg-autostart.xdgautostart	2009-12-08 15:32:06.000000000 +0100
+++ openbox-3.4.8/tools/xdg-autostart/xdg-autostart	2009-12-10 15:04:45.000000000 +0100
@@ -80,7 +80,7 @@ class AutostartFile:
     def __str__(self):
         return self.path + " : " + self.de.getName()
 
-    def _isexecfile(path):
+    def _isexecfile(self, path):
         return os.access(path, os.X_OK)
 
     def _findFile(self, path, search, match_func):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	14 May 2008 16:42:55 -0000	1.12
+++ .cvsignore	10 Dec 2009 14:17:50 -0000	1.13
@@ -1,2 +1,2 @@
 setlayout.c
-openbox-3.4.7.2.tar.gz
+openbox-3.4.8.tar.gz


Index: openbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/openbox.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- openbox.spec	22 Sep 2009 11:34:56 -0000	1.44
+++ openbox.spec	10 Dec 2009 14:17:50 -0000	1.45
@@ -1,6 +1,6 @@
 Name:		openbox
-Version:	3.4.7.2
-Release:	11%{?dist}
+Version:	3.4.8
+Release:	1%{?dist}
 Summary:	A highly configurable and standards-compliant X11 window manager
 
 Group:		User Interface/Desktops
@@ -13,10 +13,11 @@ Source3:	menu.xml
 Source4:	openbox.desktop
 
 Patch0:		openbox-3.4.7.1-autostartdir.patch
-Patch1:		openbox-3.4.7.2-gdm.patch
-Patch2:		openbox-3.4.7.2-gnomesession.patch
+Patch1:		openbox-3.4.8-gdm.patch
+Patch2:		openbox-3.4.8-gnomesession.patch
 Patch3:		openbox-3.4.7.2-autostartid.patch
 Patch4:		openbox-3.4.7.2-24bit.patch
+Patch5:		openbox-3.4.8-xdgautostart.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +79,7 @@ The %{name}-libs package contains shared
 %patch2 -p1 -b .gnomesession
 %patch3 -p1 -b .autostartid
 %patch4 -p1 -b .24bit
+%patch5 -p1 -b .xdgautostart
 
 
 %build
@@ -148,6 +150,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 10 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.8-1
+- Update to 3.4.8
+- Fix crash in xdg-autostart on desktop files with TryExec (#544006)
+
 * Tue Sep 22 2009 Miroslav Lichvar <mlichvar at redhat.com> - 3.4.7.2-11
 - Add support for 24-bit images (#524708)
 - Update setlayout.c


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	22 Sep 2009 11:34:56 -0000	1.15
+++ sources	10 Dec 2009 14:17:50 -0000	1.16
@@ -1,2 +1,2 @@
-9e7589e90519bc6ac2f4656ea6869439  openbox-3.4.7.2.tar.gz
 16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c
+3523fe9760947a15fb8ed3611090ccd2  openbox-3.4.8.tar.gz


--- openbox-3.4.7.2-gdm.patch DELETED ---


--- openbox-3.4.7.2-gnomesession.patch DELETED ---