[kdebase-runtime] compiz.patch: configure with ccsm, not simple-ccsm

[Adam Williamson]

commit 73bd44a42d2eb8d19f43fbf07c7eddf5282cf1af
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Jan 20 09:59:06 2011 +0000

    compiz.patch: configure with ccsm, not simple-ccsm

 kdebase-runtime-4.5.95-compiz.patch |    7 ++++---
 kdebase-runtime.spec                |    6 +++++-
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/kdebase-runtime-4.5.95-compiz.patch b/kdebase-runtime-4.5.95-compiz.patch
index b8aee2d..eb7cfd2 100644
--- a/kdebase-runtime-4.5.95-compiz.patch
+++ b/kdebase-runtime-4.5.95-compiz.patch
@@ -1,6 +1,6 @@
-diff -urN kdebase-runtime-4.5.95/kcontrol/componentchooser/windowmanagers/compiz.desktop kdebase-runtime-4.5.95-compiz/kcontrol/componentchooser/windowmanagers/compiz.desktop
+diff -ur kdebase-runtime-4.5.95/kcontrol/componentchooser/windowmanagers/compiz.desktop kdebase-runtime-4.5.95-compiz/kcontrol/componentchooser/windowmanagers/compiz.desktop
 --- kdebase-runtime-4.5.95/kcontrol/componentchooser/windowmanagers/compiz.desktop	2010-11-05 10:46:36.000000000 +0000
-+++ kdebase-runtime-4.5.95-compiz/kcontrol/componentchooser/windowmanagers/compiz.desktop	2011-01-20 01:21:58.467704322 +0000
++++ kdebase-runtime-4.5.95-compiz/kcontrol/componentchooser/windowmanagers/compiz.desktop	2011-01-20 09:57:24.134453897 +0000
 @@ -78,7 +78,7 @@
  Name[x-test]=xxCompizxx
  Name[zh_CN]=Compiz
@@ -8,5 +8,6 @@ diff -urN kdebase-runtime-4.5.95/kcontrol/componentchooser/windowmanagers/compiz
 -Exec=compiz ccp
 +Exec=compiz-manager
  TryExec=compiz
- X-KDE-WindowManagerConfigure=simple-ccsm
+-X-KDE-WindowManagerConfigure=simple-ccsm
++X-KDE-WindowManagerConfigure=ccsm
  X-KDE-WindowManagerRestartArgument=--replace
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index 5d52955..3a66cab 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -6,7 +6,7 @@
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Version:       4.5.95
-Release:       2%{?dist}
+Release:       3%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -280,6 +280,10 @@ fi
 
 
 %changelog
+* Thu Jan 20 2011 Adam Williamson <awilliam at redhat.com> - 4.5.95-3
+- update compiz patch to launch ccsm for configuration, not simple-ccsm
+  (we don't package it)
+
 * Thu Jan 20 2011 Adam Williamson <awilliam at redhat.com> - 4.5.95-2
 - fix up compiz launching from systemsettings (by calling compiz-manager)