rpms/compiz/devel compiz-gtk,1.13,1.14 compiz.spec,1.176,1.177

[drago01]

Author: drago01

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

Modified Files:
	compiz-gtk compiz.spec 
Log Message:
Fix up the compiz-gtk script


Index: compiz-gtk
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz-gtk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- compiz-gtk	7 Aug 2009 12:48:16 -0000	1.13
+++ compiz-gtk	22 Aug 2009 14:42:23 -0000	1.14
@@ -5,13 +5,12 @@ function runCompiz() {
 	exec compiz --ignore-desktop-hints --always-swap glib gconf gnomecompat $@
 }
 
-DIRECT=`glxinfo | grep "direct rendering: " | head -n 1 | cut -d " " -f 3`
 ISSW=`glxinfo | grep "Software Rasterizer" -c`
 
 # Try with direct rendering
 HAVETFP=`glxinfo | grep texture_from_pixmap -c`
 
-if ( [ $HAVE3D == "Yes" ]  && [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
+if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
 	runCompiz $@
 fi
 
@@ -20,7 +19,7 @@ export LIBGL_ALWAYS_INDIRECT=1
 
 HAVETFP=`glxinfo | grep texture_from_pixmap -c`
 
-if ( [ $DIRECT == "Yes" ] && [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
+if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
 	runCompiz $@
 fi
 


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- compiz.spec	7 Aug 2009 12:45:24 -0000	1.176
+++ compiz.spec	22 Aug 2009 14:42:23 -0000	1.177
@@ -14,7 +14,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -364,6 +364,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Aug 22 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-11
+- Fix up the compiz-gtk script
+
 * Fri Aug 07 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-10
 - Enable direct rendering and always-swap by default
 - Tearing free compiz for INTEL cards ;)