compiz:

- drop compiz-gtk
  - add Conflicts: control-center < 2.32.1-2
  


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2999 ec354946-7b23-47d6-9f5a-488ba84defc7

c/compiz/compiz-vl.spec

@@ -19,7 +19,7 @@ URL:            http://www.go-compiz.org
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.8.6
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -49,14 +49,12 @@ BuildRequires:  fuse-devel
 BuildRequires:  kdebase-workspace-devel
 BUildRequires:  dbus-qt-devel
 %endif
+Conflicts:	control-center < 2.32.1-2
 
 Source0:        http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
 Source2:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
 
-Source3:	compiz-gtk
-Source4:	compiz-gtk.desktop
-
 # Make sure that former beryl users still have bling
 Obsoletes: beryl-core
 
@@ -214,14 +212,6 @@ make DESTDIR=$RPM_BUILD_ROOT install || exit 1
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
 popd
 
-# install compiz-gtk/compiz-gtk.desktop
-install %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}
-
-desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE4}
-    
-
 %if %{with kde}
 # kde-desktop-effects
 echo INSTALLING KDE DESKTOP EFFECTS
@@ -343,7 +333,6 @@ rm -rf $RPM_BUILD_ROOT
 %files gnome -f gnome-files.txt
 %defattr(-, root, root)
 %{_bindir}/gtk-window-decorator
-%{_bindir}/compiz-gtk
 %{_bindir}/desktop-effects
 %{_libdir}/window-manager-settings/libcompiz.so
 %{_datadir}/gnome/wm-properties/compiz-wm.desktop
@@ -351,8 +340,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
 %{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
 %{_datadir}/compiz/desktop-effects.glade
-%{_datadir}/applications/compiz-gtk.desktop
-#{_datadir}/applications/vine-desktop-effects.desktop
 %{_datadir}/icons/hicolor/16x16/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/24x24/apps/desktop-effects.png
 %{_datadir}/icons/hicolor/32x32/apps/desktop-effects.png
@@ -385,6 +372,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Mar 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.6-4
+- drop compiz-gtk
+  - add Conflicts: control-center < 2.32.1-2
+
 * Sat Mar 12 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 0.8.6-3
 - rebuild with mesa-7.10.1
 - add cherry picked ubuntu patch