From 87075b8b3d75b632e6844e96df69adc17021c029 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 4 Sep 2008 15:06:23 +0000 Subject: [PATCH] - Don't use --choose-session option in gnome session script --- openbox-3.4.7.2-gnomesession.patch | 9 +++++++++ openbox.spec | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 openbox-3.4.7.2-gnomesession.patch diff --git a/openbox-3.4.7.2-gnomesession.patch b/openbox-3.4.7.2-gnomesession.patch new file mode 100644 index 0000000..6eaee82 --- /dev/null +++ b/openbox-3.4.7.2-gnomesession.patch @@ -0,0 +1,9 @@ +diff -up openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession openbox-3.4.7.2/data/xsession/openbox-gnome-session.in +--- openbox-3.4.7.2/data/xsession/openbox-gnome-session.in.gnomesession 2008-09-04 16:48:21.000000000 +0200 ++++ openbox-3.4.7.2/data/xsession/openbox-gnome-session.in 2008-09-04 16:49:56.000000000 +0200 +@@ -12,4 +12,4 @@ xprop -root -remove _NET_NUMBER_OF_DESKT + + # Run GNOME with Openbox as its window manager + export WINDOW_MANAGER="@bindir@/openbox" +-exec gnome-session --choose-session=openbox-session "$@" ++exec gnome-session "$@" diff --git a/openbox.spec b/openbox.spec index ed2dfab..c58ef9f 100644 --- a/openbox.spec +++ b/openbox.spec @@ -1,6 +1,6 @@ Name: openbox Version: 3.4.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A highly configurable and standards-compliant X11 window manager Group: User Interface/Desktops @@ -13,6 +13,7 @@ Source3: menu.xml Patch0: openbox-3.4.7.1-autostartdir.patch Patch1: openbox-3.4.7.2-gdm.patch +Patch2: openbox-3.4.7.2-gnomesession.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -67,6 +68,7 @@ The %{name}-libs package contains shared libraries used by %{name}. %setup -q %patch0 -p1 -b .autostartdir %patch1 -p1 -b .gdm +%patch2 -p1 -b .gnomesession %build @@ -134,6 +136,9 @@ rm -rf %{buildroot} %changelog +* Thu Sep 04 2008 Miroslav Lichvar - 3.4.7.2-5 +- Don't use --choose-session option in gnome session script + * Fri Aug 01 2008 Miroslav Lichvar - 3.4.7.2-4 - Remove field codes from commands in xdg-menu (#452403) - Add support for launching applications in xterm to xdg-menu