rpms/sugar/OLPC-3 threads.patch,NONE,1.1 sugar.spec,1.24,1.25

[Marco Pesenti Gritti]

Author: mpg

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

Modified Files:
	sugar.spec 
Added Files:
	threads.patch 
Log Message:
* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
- Properly initialize dbus threads, hopefully fixes #8234


threads.patch:

--- NEW FILE threads.patch ---
diff --git a/src/main.py b/src/main.py
index 1bb91af..890002e 100644
--- a/src/main.py
+++ b/src/main.py
@@ -21,8 +21,10 @@ import pygtk
 pygtk.require('2.0')
 import gtk
 import gobject
+import dbus.glib
 
 gtk.gdk.threads_init()
+dbus.glib.threads_init()
 
 from sugar import logger
 from sugar.profile import get_profile


Index: sugar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sugar/OLPC-3/sugar.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sugar.spec	20 Sep 2008 10:27:07 -0000	1.24
+++ sugar.spec	25 Sep 2008 12:49:50 -0000	1.25
@@ -4,7 +4,7 @@
 Summary: OLPC desktop environment
 Name: sugar
 Version: 0.82.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 2.%{alphatag}%{?dist}
 URL: http://dev.laptop.org
 # git clone git://dev.laptop.org/sugar
@@ -16,6 +16,8 @@
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: threads.patch
+
 BuildRequires: pkgconfig
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
@@ -49,6 +51,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .threads
+
 %build
 %configure
 make
@@ -93,6 +97,9 @@
 %{_bindir}/sugar-emulator
 
 %changelog
+* Thu Sep 25 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-2
+- Properly initialize dbus threads, hopefully fixes #8234
+
 * Sat Sep 20 2008 Marco Pesenti Gritti <mpg at redhat.com> - 0.82.8-1
 - #8554 Indicate connected AP in Neighborhood view.
 - #7987 Home view XO icon palette for Control Panel has wrong icon