rpms/sugar/OLPC-3 .cvsignore, 1.20, 1.21 sources, 1.22, 1.23 sugar.spec, 1.29, 1.30

[Tomeu Vizoso]

Author: tomeu

Update of /cvs/pkgs/rpms/sugar/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29057

Modified Files:
	.cvsignore sources sugar.spec 
Log Message:
* Wed Nov 05 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.83.2-2
- Set GCONF_CONFIG_SOURCE



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Sep 2008 19:18:06 -0000	1.20
+++ .cvsignore	11 Nov 2008 09:09:22 -0000	1.21
@@ -1 +1 @@
-sugar-0.82.9.tar.bz2
+sugar-0.83.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	25 Sep 2008 19:18:06 -0000	1.22
+++ sources	11 Nov 2008 09:09:22 -0000	1.23
@@ -1 +1 @@
-71af6b9632f441259e7ea5608db2ae5f  sugar-0.82.9.tar.bz2
+9b50cb553b877d755b09a12e8602dc11  sugar-0.83.2.tar.bz2


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sugar.spec	18 Oct 2008 22:54:29 -0000	1.29
+++ sugar.spec	11 Nov 2008 09:09:22 -0000	1.30
@@ -1,10 +1,12 @@
+%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
 %define commitid 454def195d
 %define alphatag 20080822git%{commitid}
 
 Summary: OLPC desktop environment
 Name: sugar
-Version: 0.82.9
-Release: 4%{?dist}
+Version: 0.83.2
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -16,15 +18,13 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: cpuleak.patch
-Patch2: 8726.patch
-
 BuildRequires: pkgconfig
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
 BuildRequires: python
 BuildRequires: pygtk2-devel
 BuildRequires: gtk2-devel
+BuildRequires: GConf2-devel
 
 Requires: sugar-artwork
 Requires: sugar-toolkit
@@ -53,9 +53,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .cpuleak
-%patch2 -p1 -b .noread
-
 %build
 %configure
 make
@@ -69,6 +66,23 @@
 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 || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/sugar.schemas > /dev/null || :
+fi
 
 %postun
 if (update-mime-database -v &> /dev/null); then
@@ -82,13 +96,15 @@
 %defattr(-,root,root,-)
 %doc COPYING README
 
-%config %{_sysconfdir}/dbus-1/system.d/NetworkManagerInfo.conf
+%config %{_sysconfdir}/dbus-1/system.d/nm-user-settings.conf
+%config %{_sysconfdir}/gconf/schemas/sugar.schemas
 
 %dir %{_datadir}/sugar
 %{_datadir}/sugar/*
 
+%{python_sitelib}/*
+
 %{_datadir}/xsessions/sugar.desktop
-%{_datadir}/dbus-1/services/*.service
 
 %{_bindir}/*
 %exclude %{_bindir}/sugar-emulator
@@ -100,6 +116,19 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Wed Nov 05 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.83.2-2
+- Set GCONF_CONFIG_SOURCE
+
+* Wed Nov 05 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.83.2-1
+- Update to 0.83.2
+
+* Tue Nov 04 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.83.1-2
+- Register the .schemas file.
+
+* Mon Nov 03 2008 Tomeu Vizoso <tomeu at tomeuvizoso.net> - 0.83.1-1
+- Update to upstream release 0.83.1
+- http://sugarlabs.org/go/ReleaseTeam/Releases/Sucrose/0.83.1#sugar
+
 * Sun Oct 19 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.9-2
 - Require gnome-python2-gconf as a quick hack to get in joyride for testing