[compiz] * Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.8.6-4 - Remove kde-desktop-effects.sh ("

[Kevin Kofler]

commit 7c125216dd28274f1d5e71308daf85a45bcb5c92
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Oct 6 06:41:58 2010 +0200

    * Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.8.6-4
    - Remove kde-desktop-effects.sh ("Compiz Switcher"), use System Settings instead
    
    System Settings has a setting for the window manager which supports KWin, Compiz
    and several other window managers (since 4.0 or 4.1). This makes the Compiz
    Switcher script redundant.
    
    Removing the script was discussed and agreed on in yesterday's KDE SIG meeting.

 compiz.spec |   40 +++++++++-------------------------------
 sources     |    1 -
 2 files changed, 9 insertions(+), 32 deletions(-)
---
diff --git a/compiz.spec b/compiz.spec
index 6554052..de834b5 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -1,5 +1,3 @@
-%define 	kde_dialogversion 0.0.6
-
 %define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs obs commands wall
 
 %define		gnome_plugins	annotate gconf glib svg gnomecompat
@@ -13,7 +11,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,9 +41,8 @@ BuildRequires:	cairo-devel
 BuildRequires:	libtool
 
 Source0:	http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
-Source1:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
-Source2:        compiz-gtk
-Source3:        compiz-gtk.desktop
+Source1:        compiz-gtk
+Source2:        compiz-gtk.desktop
 
 # Make sure that former beryl users still have bling
 Obsoletes: beryl-core
@@ -111,12 +108,11 @@ Requires: compiz-fusion = %{version}
 Obsoletes: beryl-kde
 
 %description kde
-The compiz-kde package contains kde-window-decorator,
+The compiz-kde package contains kde4-window-decorator,
 and other kde integration related stuff.
 
 
 %prep
-%setup -q -T -b1 -n kde-desktop-effects-%{kde_dialogversion}
 %setup -q
 
 %patch103 -p1 -b .composite-cube-logo
@@ -169,29 +165,11 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install || exit 1
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-install %SOURCE2 $RPM_BUILD_ROOT%{_bindir}
+install %SOURCE1 $RPM_BUILD_ROOT%{_bindir}
 
 desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %SOURCE3
-
-# kde-desktop-effects
-echo INSTALLING KDE DESKTOP EFFECTS
-pushd ../kde-desktop-effects-%{kde_dialogversion}
-cp -a kde-desktop-effects.sh $RPM_BUILD_ROOT/%{_bindir}/
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}/compiz-kde-%{version}
-cp -a ChangeLog COPYING README $RPM_BUILD_ROOT/%{_docdir}/compiz-kde-%{version}
-
-iconlist="16 24 32 36 48 96"
-for i in $iconlist; do
- mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/
- cp -p desktop-effects$i.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$i\x$i/apps/kde-desktop-effects.png
-done
-
-desktop-file-install --vendor=""              \
---dir=%{buildroot}%{_datadir}/applications/kde \
-kde-desktop-effects.desktop
-popd
+  %SOURCE2
 
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -290,9 +268,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %{_bindir}/kde4-window-decorator
 %{_docdir}/compiz-kde-%{version}
-%{_bindir}/kde-desktop-effects.sh
-%{_datadir}/applications/kde/kde-desktop-effects.desktop
-%{_datadir}/icons/hicolor/*/apps/kde-desktop-effects.png
 %{_datadir}/compiz/kconfig.xml
 
 %files devel
@@ -308,6 +283,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.8.6-4
+- Remove kde-desktop-effects.sh ("Compiz Switcher"), use System Settings instead
+
 * Fri Jul 30 2010 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.6-3
 - Some backports from upstream
 
diff --git a/sources b/sources
index 7515e4c..1d9e15b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-e40e51ba5837a11bea58231b6ae49611  kde-desktop-effects-0.0.6.tar.bz2
 1e284eade99ff310551d5919b6ba57c1  compiz-0.8.6.tar.bz2