rpms/sugar/devel sugar.spec,1.30,1.31

[Marco Pesenti Gritti]

Author: mpg

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

Modified Files:
	sugar.spec 
Log Message:
* Thu Nov  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.2-2
- Fix gconf schemas installation




Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/devel/sugar.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sugar.spec	6 Nov 2008 00:07:21 -0000	1.30
+++ sugar.spec	6 Nov 2008 11:16:31 -0000	1.31
@@ -6,7 +6,7 @@
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.83.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -59,13 +59,17 @@
 
 %install
 rm -rf %{buildroot}
+
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot}
-%find_lang %name
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 %post
 if (update-mime-database -v &> /dev/null); then
   update-mime-database "%{_datadir}/mime" > /dev/null
 fi
+
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || :
 
@@ -115,6 +119,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Nov  6 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.2-2
+- Fix gconf schemas installation
+
 * Tue Nov  4 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.83.2-1
 - Update to 0.83.2