diff --git a/.cvsignore b/.cvsignore index 4c2aad4..2bb8345 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sugar-0.75.13.tar.bz2 +sugar-0.79.0.tar.bz2 diff --git a/sources b/sources index 94c48ff..0d8ba3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0eb7d56675a6e8c62d4d335f13b24008 sugar-0.75.13.tar.bz2 +e10b794279af18fc4fd0d7de04c76bc8 sugar-0.79.0.tar.bz2 diff --git a/sugar-0.65-jabberserver.patch b/sugar-0.65-jabberserver.patch deleted file mode 100644 index d0c17ee..0000000 --- a/sugar-0.65-jabberserver.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sugar-0.65/lib/sugar/profile.py.old 2007-09-24 22:35:48.000000000 +0200 -+++ sugar-0.65/lib/sugar/profile.py 2007-09-24 22:36:05.000000000 +0200 -@@ -24,7 +24,7 @@ - from sugar import util - from sugar.graphics.xocolor import XoColor - --DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk' -+DEFAULT_JABBER_SERVER = 'ship2.jabber.laptop.org' - DEFAULT_VOLUME = 81 - - _profile = None diff --git a/sugar.spec b/sugar.spec index 0033f87..5d5fb54 100644 --- a/sugar.spec +++ b/sugar.spec @@ -1,8 +1,6 @@ -%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - Summary: OLPC desktop environment Name: sugar -Version: 0.75.13 +Version: 0.79.0 Release: 2%{?dist} URL: http://dev.laptop.org Source0: http://dev.laptop.org/pub/sugar/release/%{name}-%{version}.tar.bz2 @@ -10,35 +8,17 @@ License: GPL/LGPL Group: System Environment/Libraries Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: sugar-0.65-jabberserver.patch - BuildRequires: pkgconfig -BuildRequires: pygtk2-devel BuildRequires: perl-XML-Parser BuildRequires: gettext -BuildRequires: gstreamer-devel -BuildRequires: gtk2-devel -BuildRequires: dbus-devel BuildRequires: python +BuildRequires: pygtk2-devel +BuildRequires: gtk2-devel -Requires: gnome-python2-rsvg +Requires: sugar-artwork +Requires: sugar-toolkit Requires: gnome-python2-libwnck -Requires: pygtk2 -Requires: dbus-python -Requires: dbus -Requires: libxml2-python -Requires: avahi-tools -Requires: hippo-canvas-python Requires: matchbox-window-manager -Requires: vte -Requires: sugar-artwork -Requires: sugar-datastore -Requires: sugar-base -Requires: sugar-presence-service -Requires: python-telepathy -Requires: telepathy-gabble -Requires: telepathy-glib -Requires: numpy %description @@ -49,8 +29,6 @@ goals of this project. %prep %setup -q -%patch1 -p1 -b .jabberserver - %build %configure make @@ -75,12 +53,10 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) -%doc COPYING COPYING.LIB README +%doc COPYING README %config %{_sysconfdir}/dbus-1/system.d/NetworkManagerInfo.conf -%{python_sitelib}/* - %dir %{_datadir}/sugar %{_datadir}/sugar/* @@ -91,14 +67,14 @@ rm -rf %{buildroot} %{_datadir}/mime/packages/sugar.xml %changelog -* Mon Mar 10 2008 Dennis Gilmore - 0.75.13-2 -- Requires numpy +* Mon Feb 11 2008 Marco Pesenti Gritti - 0.79.0-2 +- Require sugar-artwork -* Tue Feb 12 2008 Marco Pesenti Gritti - 0.75.13-1 -- Updated translations +* Fri Feb 8 2008 Marco Pesenti Gritti - 0.79.0-1 +- Update to 0.79.0, rework dependencies because of the toolkit split -* Sat Feb 9 2008 Marco Pesenti Gritti - 0.75.12-1 -- Revert fix for #5904 (not approved). Fix #6332. +* Sat Feb 2 2008 Marco Pesenti Gritti - 0.75.11-2 +- Rebuild * Tue Jan 29 2008 Marco Pesenti Gritti - 0.75.11-1 - Fix #5904