rpms/compiz/F-8 .cvsignore, 1.31, 1.32 compiz.spec, 1.110, 1.111 sources, 1.33, 1.34

[Adel Gadllah (drago01)]

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32411

Modified Files:
	.cvsignore compiz.spec sources 
Log Message:
add kde-desktop-effects to the kde subpackage


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-8/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	22 Oct 2007 18:30:32 -0000	1.31
+++ .cvsignore	30 Oct 2007 17:41:40 -0000	1.32
@@ -1,2 +1,3 @@
 desktop-effects-0.7.7.tar.bz2
 compiz-0.6.2.tar.gz
+kde-desktop-effects-0.0.4.tar.bz2


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-8/compiz.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- compiz.spec	23 Oct 2007 16:20:15 -0000	1.110
+++ compiz.spec	30 Oct 2007 17:41:40 -0000	1.111
@@ -1,4 +1,5 @@
 %define		dialogversion	0.7.7
+%define 	kde_dialogversion 0.0.4
 
 %define		core_plugins	blur clone cube dbus decoration fade ini inotify minimize move place plane png regex resize rotate scale screenshot switcher video water wobbly zoom fs
 
@@ -13,7 +14,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +46,7 @@
 
 Source0:        %{name}-%{version}.tar.gz
 Source1:	desktop-effects-%{dialogversion}.tar.bz2
+Source2:	kde-desktop-effects-%{kde_dialogversion}.tar.bz2
 
 # Make sure that former beryl users still have bling
 Obsoletes: berly-core
@@ -101,6 +103,7 @@
 Summary: Compiz kde integration bits
 Group: User Interface/Desktops
 Requires: %{name} = %{version}
+Requires: compiz-manager
 Obsoletes: beryl-kde
 
 %description kde
@@ -110,6 +113,7 @@
 
 %prep
 %setup -q -T -b1 -n desktop-effects-%{dialogversion}
+%setup -q -T -b2 -n kde-desktop-effects-%{kde_dialogversion}
 %setup -q 
 
 %patch103 -p1 -b .composite-cube-logo
@@ -160,9 +164,29 @@
   $RPM_BUILD_ROOT%{_datadir}/applications/desktop-effects.desktop
 popd
 
+# 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-%{dialogversion}/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
+
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
+
 %find_lang compiz
 %find_lang desktop-effects
 
@@ -224,6 +248,13 @@
 	/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%post kde
+update-desktop-database -q %{_datadir}/applications/kde
+touch --no-create %{_datadir}/icons/hicolor
+
+%postun kde
+touch --no-create %{_datadir}/icons/hicolor
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -263,6 +294,10 @@
 %files kde
 %defattr(-, root, root)
 %{_bindir}/kde-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
 
 
 %files devel
@@ -278,6 +313,9 @@
 
 
 %changelog
+* Thu Oct 25 2007 Sebastian Vahl <fedora at deadbabylon.de> - 0.6.2-3
+- Include kde-desktop-effects in kde subpackage
+
 * Tue Oct 23 2007 Adel Gadllah <adel.gadllah at gmail.com> - 0.6.2-2
 - Obsolete berly-core
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-8/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	22 Oct 2007 18:30:32 -0000	1.33
+++ sources	30 Oct 2007 17:41:40 -0000	1.34
@@ -1,2 +1,3 @@
 f6b22bbc1f202b47e71baeda25935f40  desktop-effects-0.7.7.tar.bz2
 7e6edfdbf0dc46b135313440edae7a53  compiz-0.6.2.tar.gz
+3a7f26f0f73aa75ca42edd27a8c4981e  kde-desktop-effects-0.0.4.tar.bz2