rpms/compiz/devel compiz-gtk,1.15,1.16 compiz.spec,1.194,1.195

[drago01]

Author: drago01

Update of /cvs/pkgs/rpms/compiz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2773

Modified Files:
	compiz-gtk compiz.spec 
Log Message:
Use ccp instead of plain gconf when the cccp gconf plugin is installed


Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- compiz-gtk	21 Sep 2009 16:03:20 -0000	1.15
+++ compiz-gtk	21 Feb 2010 11:41:30 -0000	1.16
@@ -2,7 +2,12 @@
 
 function runCompiz() {
 	gtk-window-decorator &
-	exec compiz --ignore-desktop-hints glib gconf gnomecompat $@
+	if ( [ -e /usr/lib/compizconfig/backends/libgconf.so ] || [ -e /usr/lib64/compizconfig/backends/libgconf.so ] )
+        then
+                exec compiz --ignore-desktop-hints ccp $@
+        else
+        	exec compiz --ignore-desktop-hints glib gconf gnomecompat $@
+        fi
 }
 
 ISSW=`glxinfo | grep "Software Rasterizer" -c`


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -p -r1.194 -r1.195
--- compiz.spec	13 Feb 2010 20:12:31 -0000	1.194
+++ compiz.spec	21 Feb 2010 11:41:30 -0000	1.195
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -308,6 +308,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 21 2010 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.4-6
+- Use ccp if present (RH #532229)
+
 * Sat Feb 13 2010 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.4-5
 - Fix FTBFS (RH #555429)