[kdebase-runtime] add compiz.patch to fix compiz launching from systemsettings

[Adam Williamson]

commit 1cf31374fd4b35d0d7c824a4d8b320032db37dca
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Jan 20 01:25:02 2011 +0000

    add compiz.patch to fix compiz launching from systemsettings

 kdebase-runtime-4.5.95-compiz.patch |   12 ++++++++++++
 kdebase-runtime.spec                |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-runtime-4.5.95-compiz.patch b/kdebase-runtime-4.5.95-compiz.patch
new file mode 100644
index 0000000..b8aee2d
--- /dev/null
+++ b/kdebase-runtime-4.5.95-compiz.patch
@@ -0,0 +1,12 @@
+diff -urN 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
+@@ -78,7 +78,7 @@
+ Name[x-test]=xxCompizxx
+ Name[zh_CN]=Compiz
+ Name[zh_TW]=Compiz
+-Exec=compiz ccp
++Exec=compiz-manager
+ TryExec=compiz
+ X-KDE-WindowManagerConfigure=simple-ccsm
+ X-KDE-WindowManagerRestartArgument=--replace
diff --git a/kdebase-runtime.spec b/kdebase-runtime.spec
index ec948b7..5d52955 100644
--- a/kdebase-runtime.spec
+++ b/kdebase-runtime.spec
@@ -6,7 +6,7 @@
 Name:          kdebase-runtime
 Summary:       KDE Runtime
 Version:       4.5.95
-Release:       1%{?dist}
+Release:       2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License:       LGPLv2+
@@ -21,6 +21,9 @@ Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 # add OnlyShowIn=KDE  to Desktop/Home.desktop (like trash.desktop)
 Patch6:        kdebase-runtime-4.3.3-home_onlyshowin_kde.patch
 Patch7:        kdebase-runtime-4.5.3-htsearch.patch
+# Launch compiz via compiz-manager so we get window decorations and
+# other such decadent luxuries (AdamW 2011/01)
+Patch8:        kdebase-runtime-4.5.95-compiz.patch
 
 ## upstream patches
 
@@ -121,6 +124,7 @@ BuildArch: noarch
 %patch3 -p1 -b .iconthemes-inherit
 %patch6 -p1 -b .home_onlyshowin_kde
 %patch7 -p1 -b .htsearch
+%patch8 -p1 -b .config
 
 
 %build
@@ -276,6 +280,9 @@ fi
 
 
 %changelog
+* Thu Jan 20 2011 Adam Williamson <awilliam at redhat.com> - 4.5.95-2
+- fix up compiz launching from systemsettings (by calling compiz-manager)
+
 * Wed Jan 05 2011 Jaroslav Reznik <jreznik at redhat.com> - 4.5.95-1
 - 4.5.95 (4.6rc2)