diff --git a/sugar.spec b/sugar.spec index 53e6b7d..a3567cf 100644 --- a/sugar.spec +++ b/sugar.spec @@ -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 @@ License: GPL/LGPL 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 @@ multiple instances of sugar. %prep %setup -q +%patch1 -p1 -b .threads + %build %configure make @@ -93,6 +97,9 @@ rm -rf %{buildroot} %{_bindir}/sugar-emulator %changelog +* Thu Sep 25 2008 Marco Pesenti Gritti - 0.82.8-2 +- Properly initialize dbus threads, hopefully fixes #8234 + * Sat Sep 20 2008 Marco Pesenti Gritti - 0.82.8-1 - #8554 Indicate connected AP in Neighborhood view. - #7987 Home view XO icon palette for Control Panel has wrong icon diff --git a/threads.patch b/threads.patch new file mode 100644 index 0000000..a70dd73 --- /dev/null +++ b/threads.patch @@ -0,0 +1,15 @@ +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