Mailinglist Archive: opensuse-commit (1650 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package compiz-manager
checked in at Mon Oct 6 16:38:55 CEST 2008.


--------
--- compiz-manager/compiz-manager.changes       2008-09-19 16:03:53.000000000 
+0200
+++ /mounts/work_src_done/STABLE/compiz-manager/compiz-manager.changes  
2008-10-06 14:07:28.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Oct  6 14:00:33 CEST 2008 - rodrigo@xxxxxxxxxx
+
+- Remove re-added by mistake whitelist file.
+- Review and merge changes from X11:Compiz
+
+-------------------------------------------------------------------
+Sat Oct  4 21:55:38 IST 2008 - cyberorg@xxxxxxxxxxxx
+
+- Fix fallback window manager, fixes bnc #432327 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  compiz-manager-fallbackwm.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ compiz-manager.spec ++++++
--- /var/tmp/diff_new_pack.Y28443/_old  2008-10-06 16:38:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Y28443/_new  2008-10-06 16:38:17.000000000 +0200
@@ -24,7 +24,7 @@
 PreReq:         %fillup_prereq
 Requires:       compiz 
 Version:        0.0.1_git080201 
-Release:        48
+Release:        49
 Summary:        A wrapper script to launch Compiz with proper options
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %name-%version.tar.bz2
@@ -33,6 +33,7 @@
 # PATCH-FIX-OPENSUSE compiz-manager-blacklist-ati-and-radeon.patch 
rodrigo@xxxxxxxxxx -- Remove ATI and RADEON cards from WHITELIST
 Patch1:         compiz-manager-blacklist-ati-and-radeon.patch
 Patch2:         compiz-manager-NOMAD.diff
+Patch3:         compiz-manager-fallbackwm.patch
 ExclusiveArch:  %ix86 x86_64 ppc ppc64 ia64
 BuildArch:      noarch
 
@@ -53,6 +54,7 @@
 %patch -p1
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 
 %install
 %__install -d -m 755 %{buildroot}/%{_bindir}
@@ -70,6 +72,11 @@
 %{_datadir}/compiz-manager/*
 
 %changelog
+* Mon Oct 06 2008 rodrigo@xxxxxxxxxx
+- Remove re-added by mistake whitelist file.
+- Review and merge changes from X11:Compiz
+* Sat Oct 04 2008 cyberorg@xxxxxxxxxxxx
+- Fix fallback window manager, fixes bnc #432327
 * Fri Sep 19 2008 rodrigo@xxxxxxx
 - Remove whitelist-radeonrandr12.diff
 - Added compiz-manager-blacklist-ati-and-radeon.patch to remove


++++++ compiz-manager-fallbackwm.patch ++++++
diff -ur a/compiz-manager b/compiz-manager
--- a/compiz-manager    2008-03-13 18:46:12.000000000 +0530
+++ b/compiz-manager    2008-10-04 21:51:17.000000000 +0530
@@ -43,6 +43,7 @@
 GLXINFO="/usr/bin/glxinfo"
 KWIN=`which kwin`
 METACITY="/usr/bin/metacity"
+XFWM="/usr/bin/xfwm"
 COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) 
 FUSION_ICON=`which fusion-icon`
 
@@ -58,11 +59,9 @@
 
 # For detecting what driver is in use, the + is for one or more /'s
 XORG_DRIVER_PATH="/usr/$LIB/xorg/modules/drivers/+"
-
-if [ $DESKTOP_SESSION == "kde" ]; then
-    FALLBACKWM="${KWIN}"
-else
-    FALLBACKWM="${METACITY}"
+if [ x"$KDE_FULL_SESSION" = x"true" ]; then FALLBACKWM="${KWIN}";
+    elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then 
FALLBACKWM="${METACITY}";
+    elif xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; 
then FALLBACKWM="${XFWM}";
 fi
 
 FALLBACKWM_OPTIONS="--replace $@"

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx