rpms/lxde-common/devel lxde-common-0.3.2.1-gdm-number-of-desktops.patch, NONE, 1.1 lxde-common.spec, 1.1, 1.2

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxde-common/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9452

Modified Files:
	lxde-common.spec 
Added Files:
	lxde-common-0.3.2.1-gdm-number-of-desktops.patch 
Log Message:
* Sat Nov 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-4
- Workaround for new gdm


lxde-common-0.3.2.1-gdm-number-of-desktops.patch:

--- NEW FILE lxde-common-0.3.2.1-gdm-number-of-desktops.patch ---
--- lxde-common-0.3.2.1.orig/startlxde.in	2008-04-20 10:26:19.000000000 +0200
+++ lxde-common-0.3.2.1/startlxde.in	2008-11-01 01:52:54.000000000 +0100
@@ -18,6 +18,14 @@
     cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml"
 fi
 
+# Workaround for gdm, openbox and the number of desktops
+NUMBER_DESKTOPS=`grep \<number\> "$OPENBOX_CONF_DIR/lxde-rc.xml" | awk -F \> {'print $2}' | awk -F \< {'print $1}'`
+if test x"`which wmctrl 2>/dev/null`" != x""; then
+    (until [ `wmctrl -d | wc -l ` = "$NUMBER_DESKTOPS" ];do
+	wmctrl -n "$NUMBER_DESKTOPS"
+    done) &
+fi
+
 # Enable GTK+2 integration for OpenOffice.org, if available.
 export SAL_USE_VCLPLUGIN=gtk
 


Index: lxde-common.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxde-common/devel/lxde-common.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lxde-common.spec	10 Oct 2008 23:51:57 -0000	1.1
+++ lxde-common.spec	1 Nov 2008 02:53:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           lxde-common
 Version:        0.3.2.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Default configuration files for LXDE
 Summary(de):    Konfigurationsdateien für LXDE
 
@@ -12,6 +12,9 @@
 Patch1:         %{name}-0.3.2.1-lxpanel-mixer.patch
 Patch2:         %{name}-0.3.2.1-lxterminal.patch
 Patch3:         %{name}-0.3.2.1-lxpanel-no-background-by-default.patch
+# Because of new gdm
+# http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?24:mss:5608:200804:keopkmedognljeggknac
+Patch4:         %{name}-0.3.2.1-gdm-number-of-desktops.patch
 # Vendor specific patches
 Patch10:         %{name}-0.3.0.1-default-wallpaper.patch
 Patch11:         %{name}-0.3.2.1-vendor-artwork.patch
@@ -19,13 +22,15 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pkgconfig glib2-devel libX11-devel
-Requires:       lxsession lxpanel pcmanfm openbox  
+Requires:       lxsession lxpanel pcmanfm openbox
 # Use vendor's artwork
 Requires:       gtk-nodoka-engine fedora-icon-theme
 %if 0%{?fedora} < 9
 Requires:       desktop-backgrounds-basic
 %else
 Requires:       desktop-backgrounds-compat
+# needed for new gdm workaround
+Requires:       wmctrl
 %endif
 
 
@@ -44,6 +49,9 @@
 %patch1 -p1 -b .mixer
 %patch2 -p1 -b .lxterminal
 %patch3 -p1 -b .no-background
+%if 0%{?fedora} < 9
+%patch4 -p1 -b .gdm-desktops
+%endif
 %patch10 -p1 -b .default-wallpaper
 %patch11 -p1 -b .vendor
 %patch12 -p1 -b .starthere
@@ -85,6 +93,9 @@
 
 
 %changelog
+* Sat Nov 01 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-4
+- Workaround for new gdm
+
 * Fri Oct 10 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.2.1-3
 - Require fedora-icon-theme and fedora-logos