rpms/compiz-fusion/devel compiz-fusion.spec,1.51,1.52

[drago01]

Author: drago01

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

Modified Files:
	compiz-fusion.spec 
Log Message:
fix conflict


Index: compiz-fusion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz-fusion/devel/compiz-fusion.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- compiz-fusion.spec	10 Jul 2009 21:27:27 -0000	1.51
+++ compiz-fusion.spec	13 Jul 2009 16:30:43 -0000	1.52
@@ -1,8 +1,8 @@
-%define plugins animation bs colorfilter expo ezoom jpeg mag mousepoll neg opacify put resizeinfo ring scaleaddon session shift snap staticswitcher text thumbnail vpswitch wall winrules workarounds
+%define plugins animation bs colorfilter expo ezoom jpeg mag mousepoll neg opacify put resizeinfo ring scaleaddon session shift snap staticswitcher text thumbnail vpswitch winrules workarounds
 
 Name: compiz-fusion
 Version: 0.8.2      
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Collection of Compiz Fusion plugins for Compiz      
 
 Group: User Interface/Desktops        
@@ -82,6 +82,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*
 # remove wall plugin
 rm -f $RPM_BUILD_ROOT%{_datadir}/compiz/wall.xml
 rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/libwall.so
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/compiz-wall.schemas
 
 %find_lang compiz-plugins-main
 
@@ -139,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 13 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.8.2-3
+- Remove the wall gconf schema (conflicts with the one in compiz)
+
 * Fri Jul 10 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.8.2-2
 - Don't ship the wall plugin, moved to the compiz package