diff --git a/.cvsignore b/.cvsignore index 6305273..7c9f548 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -sugar-0.86.3.tar.bz2 +sugar-0.88.1.tar.bz2 diff --git a/sources b/sources index c194908..364c49b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ba8a6133540bb1037396adf552af52f sugar-0.86.3.tar.bz2 +2b1fe85181b2b246b0be85e6786dc879 sugar-0.88.1.tar.bz2 diff --git a/sugar-enable-settings-manager.patch b/sugar-enable-settings-manager.patch new file mode 100644 index 0000000..038f04b --- /dev/null +++ b/sugar-enable-settings-manager.patch @@ -0,0 +1,13 @@ +diff --git a/bin/sugar.in b/bin/sugar.in +index 498b573..813b189 100644 +--- a/bin/sugar.in ++++ b/bin/sugar.in +@@ -36,6 +36,8 @@ while [ $# -ne 0 ] ; do + shift + done + ++sugar-settings-manager & ++ + if test -z "$SUGAR_SCALING"; then + export SUGAR_SCALING=72 + fi diff --git a/sugar.spec b/sugar.spec index 43accb4..69653fb 100644 --- a/sugar.spec +++ b/sugar.spec @@ -1,19 +1,12 @@ -%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - -%define commitid 4232758da5 -%define alphatag 20090401git%{commitid} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} Summary: Constructionist learning platform Name: sugar -Version: 0.86.3 +Version: 0.88.1 Release: 1%{?dist} -#Release: 4.%{alphatag}%{?dist} URL: http://sugarlabs.org/ -# git clone git://dev.laptop.org/sugar -# cd sugar -# git-checkout %{commitid} -#Source0: %{name}-%{version}-git%{commitid}.tar.bz2 Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2 +Patch0: sugar-enable-settings-manager.patch License: GPLv2+ Group: User Interface/Desktops Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,6 +22,7 @@ BuildRequires: intltool Requires: sugar-artwork Requires: sugar-toolkit +Requires: sugar-settings-manager Requires: gnome-python2-libwnck Requires: gnome-python2-gconf Requires: metacity @@ -45,22 +39,21 @@ Requires: openssh Obsoletes: sugar-journal <= 99 Obsoletes: sugar-update-control <= 99 -%description +BuildArch: noarch -Sugar provides simple yet powerful means of engaging young -children in the world of learning that is opened up by computers -and the Internet. With Sugar, even the youngest learner will quickly -become proficient in using the computer as a tool to engage in -authentic problem-solving. Sugar promotes sharing, collaborative -learning, and reflection, developing skills that help them in all -aspects of life. +%description +Sugar provides simple yet powerful means of engaging young children in the +world of learning that is opened up by computers and the Internet. With Sugar, +even the youngest learner will quickly become proficient in using the +computer as a tool to engage in authentic problem-solving. Sugar promotes +sharing, collaborative learning, and reflection, developing skills that help +them in all aspects of life. -Sugar is also the desktop environment for the One Laptop Per Child -project; see the sites http://fedoraproject.org/wiki/OLPC and -http://www.laptop.org for goals of this project. +Sugar is also the learning environment for the One Laptop Per Child project. +See http://www.laptop.org for more information on this project. %package emulator -Summary: The emulator for the Sugar Desktop Environment +Summary: The emulator for the Sugar Learning Platform Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: xorg-x11-server-Xephyr @@ -73,6 +66,7 @@ multiple instances of sugar. %prep %setup -q +%patch0 -p1 %build %configure @@ -83,6 +77,7 @@ rm -rf %{buildroot} export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%{buildroot} +mkdir %{buildroot}/%{_datadir}/sugar/activities unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %find_lang %{name} @@ -126,6 +121,7 @@ rm -rf %{buildroot} %config %{_sysconfdir}/gconf/schemas/sugar.schemas %dir %{_datadir}/sugar +%dir %{_datadir}/sugar/activities %{_datadir}/sugar/* %{python_sitelib}/* @@ -144,36 +140,63 @@ rm -rf %{buildroot} %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg %changelog +* Thu Jun 3 2010 Peter Robinson - 0.88.1-1 +- New upstream stable 0.88.1 release + +* Sat May 30 2010 Peter Robinson - 0.88.0-3 +- Bump build + +* Sat May 30 2010 Peter Robinson - 0.88.0-2 +- Clean up some descriptions + +* Tue Mar 20 2010 Peter Robinson - 0.88.0-1 +- New upstream stable 0.88.0 release + +* Wed Mar 10 2010 Sebastian Dziallas - 0.87.8-1 +- New upstream release + +* Tue Mar 02 2010 Sebastian Dziallas - 0.87.6-1 +- New upstream release + +* Wed Feb 17 2010 Sebastian Dziallas - 0.87.5-1 +- New upstream release + +* Tue Feb 16 2010 Sebastian Dziallas - 0.87.4-2 +- Enable sugar-settings-manager support + +* Thu Feb 11 2010 Sebastian Dziallas - 0.87.4-1 +- New upstream release + +* Tue Jan 12 2010 Sebastian Dziallas - 0.87.3-1 +- New upstream release + +* Sat Jan 9 2010 Peter Robinson - 0.87.2-2 +- Updated to the new python sysarch spec file reqs + +* Wed Dec 23 2009 Sebastian Dziallas - 0.87.2-1 +- New upstream release + +* Tue Dec 01 2009 Sebastian Dziallas - 0.87.1-1 +- New upstream release +- Make this noarch again + +* Fri Nov 20 2009 Tomeu Vizoso - 0.86.3-5 +- One more try + +* Fri Nov 20 2009 Tomeu Vizoso - 0.86.3-4 +- Create %{_datadir}/sugar/activities + +* Fri Nov 20 2009 Tomeu Vizoso - 0.86.3-3 +- Own %{_datadir}/sugar/activities. Fixes #532796 + +* Wed Oct 21 2009 Sebastian Dziallas - 0.86.3-2 +- add missing file to appropriate section + * Wed Oct 21 2009 Sebastian Dziallas - 0.86.3-1 - Sporadic freezes while scrolling journal #1506 - Suppress race condition with Journal appearing on sugar startup #1373 - Alt+Space not working to show/hide the tray #1476 -* Thu Oct 08 2009 Simon Schampijer - 0.86.2-1 -- Not able to make screenshot #1464 -- debug logs for the presence service and connection managers not -working #927 -- Not able to stop activities #1444 - -* Thu Oct 01 2009 Simon Schampijer - 0.86.1-3 -- typo - -* Thu Oct 01 2009 Simon Schampijer - 0.86.1-2 -- added sugar-xo.svg icon to the emulator package - -* Thu Oct 01 2009 Simon Schampijer - 0.86.1-1 -- Activities tray doesn't reflect well on switching between windows if -there are non-sugar ones #1444 -- sugar-emulator starts sugar out of Xephyr #1432 -- Sugar resets gnome's cursor #1433 -- Pass timestamp to gdk.Window.focus() on shell startup #1451 -- Starting/resuming an entry from Journal shows wrong colours #1421 -- Control panel resizing issue (for non en_US languages) #308 -- Do not start title editing for non-ds objects #1411 -- Shutdown/Reboot fails when multiple users are logged in #246 -- Package sugar-desktop icon #1139 -- Present windows in non-active process #1423 - * Sun Sep 27 2009 Sebastian Dziallas - 0.86.0-1 - New upstream release