Fructose generated by jhconvert

26 files changed, 1045 insertions, 437 deletions

diff --git a/0.84/sucrose/etoys/SPECS/etoys.spec b/0.84/sucrose/etoys/SPECS/etoys.spec
index 12d4b73..460e544 100644
--- a/0.84/sucrose/etoys/SPECS/etoys.spec
+++ b/0.84/sucrose/etoys/SPECS/etoys.spec
@@ -1,57 +1,62 @@
-%define name    etoys
-%define version 4.0.2206 
-%define release 1
-%define source  %{name}-%{version}
-
-Name:		%{name}
-Summary:	A media-rich model, game, and simulation construction kit and authoring tool
-Version:	%{version}
-Release:	%{release}
-Vendor:		Viewpoints Research
-Url:		http://squeakland.org/
-License:	Apache License
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
-Source:		%{source}.tar.bz2
-Group:		Development/Languages
-Requires:	squeak-vm >= 3.10
-Requires:	shared-mime-info
-BuildRequires:	gettext
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: etoys
+Version: 4.0.2212
+Release: 1
+Summary: Squeak Etoys activity for Sugar
+License: MIT/Apache
+Group: Graphical desktop/Other
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-4.0.2212.tar.gz
+
+Requires: squeak-vm >= 3.10.3
+
+BuildRequires: gettext  
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
-Squeak Etoys was inspired by LOGO, PARC-Smalltalk, Hypercard,
-and starLOGO. It is a media-rich authoring environment with a
-simple powerful scripted object model for many kinds of objects
-created by end-users that runs on many platforms, and is free
-and open source. It includes 2D and 3D graphics, images, text,
-particles, pres-entations, web-pages, videos, sound and MIDI, etc.
-It includes the ability to share desktops with other Etoy users
-in real-time, so many forms of immersive mentoring and play can
-be done over the Internet.
+Squeak Etoys was inspired by LOGO, PARC-Smalltalk, Hypercard, starLOGO
+and AgentSheets. It is a media-rich authoring environment with a simple,
+powerful scripted object model for many kinds of objects created by end-users
+that runs on many platforms, and it is free and open source. It includes 2D and
+3D graphics, images, text, particles, presentations, web-pages, videos, sound
+and MIDI, etc. It includes the ability to share desktops with other Etoy users
+in real-time, so many forms of immersive mentoring and play can be done over
+the Internet.
 
 %prep
-%setup -n %{source}
+%setup -q -n etoys-4.0.2212
+
 
 %build
-./autogen.sh --prefix=%_prefix
-make ROOT=%{buildroot} %{?_smp_mflags}
+%configure  \
+	--exec-prefix='${prefix}' \
+	--datarootdir='${prefix}/share' \
+	--datadir='${prefix}/share' \
+	--bindir='${prefix}/bin'
+make 
 
 %install
-make install-etoys ROOT=%{buildroot}
+rm -rf %{buildroot}
+make  \
+	ROOT=%{buildroot} \
+	datadir=%{buildroot}/%{_prefix}/share \
+	install-etoys
+%fdupes -s %{buildroot}
 
 %clean
-[ -n "%{buildroot}" -a "%{buildroot}" != "/" ] && rm -rf "%{buildroot}"
+rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root)
-%dir %_datadir/etoys
-%_datadir/etoys/*
-%dir %_datadir/etoys/ExampleEtoys
-%_datadir/etoys/ExampleEtoys/*
-%dir %_datadir/etoys/QuickGuides
-%_datadir/etoys/QuickGuides/*
-%_bindir/etoys
-/usr/share/doc/etoys
-%_datadir/mime/packages/etoys.xml
+%defattr(-,root,root,-)
+%{_bindir}/*
+%{_datadir}/etoys
+%{_datadir}/mime/packages/*
+%{_datadir}/doc/*
 
 %changelog
+
diff --git a/0.84/sucrose/gstreamer-0_10-plugins-espeak/SPECS/gstreamer-0_10-plugins-espeak.spec b/0.84/sucrose/gstreamer-0_10-plugins-espeak/SPECS/gstreamer-0_10-plugins-espeak.spec
index 3ffaf52..9739e02 100644
--- a/0.84/sucrose/gstreamer-0_10-plugins-espeak/SPECS/gstreamer-0_10-plugins-espeak.spec
+++ b/0.84/sucrose/gstreamer-0_10-plugins-espeak/SPECS/gstreamer-0_10-plugins-espeak.spec
@@ -1,13 +1,8 @@
 # NOTE: Do not edit, file was generated by jhconvert
 
-Name: gstreamer0.10-espeak
+Name: gstreamer-0_10-plugins-espeak
 Version: 0.3.1
-%if 0%{?suse_version}
-Release: 1
-%else
-Release:        1%{?dist}
-%endif
-
+Release: 2
 Summary: Simple gstreamer plugin to use espeak by way of sound source
 License: LGPLv2+
 Group: Sound
@@ -22,7 +17,8 @@ Requires: gstreamer
 
 BuildRequires: espeak-devel  
 BuildRequires: gstreamer-0_10-plugins-base-devel  
-BuildRequires: gstreamer-0_10-devel  
+BuildRequires: gstreamer-devel  
+BuildRequires: fdupes
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,6 +42,7 @@ rm -rf %{buildroot}
 make  \
 	install \
 	DESTDIR=%{buildroot}
+%fdupes -s %{buildroot}
 
 
 %clean
@@ -56,19 +53,5 @@ rm -rf %{buildroot}
 %{_libdir}/gstreamer*/*
 %doc AUTHORS COPYING NEWS README
 
-
-
 %changelog
-* Sat Mar 21 2009 Aleksey Lim <alsroot@mandriva.org> 0.3.1-1mdv2009.1
-+ Revision: 360049
-- update version to 0.3.1
-
-* Fri Mar 13 2009 Aleksey Lim <alsroot@mandriva.org> 0.3-1mdv2009.1
-+ Revision: 354524
-- update to 0.3 release
-- update to new version 0.2
-
-* Tue Feb 17 2009 Aleksey Lim <alsroot@mandriva.org> 0.1-1mdv2009.1
-+ Revision: 341766
-- Initial commit
 
diff --git a/0.84/sucrose/gstreamer-0_10-plugins-espeak/SPECS/gstreamer0.10-espeak.spec b/0.84/sucrose/gstreamer-0_10-plugins-espeak/SPECS/gstreamer0.10-espeak.spec
deleted file mode 100644
index 3dd66b6..0000000
--- a/0.84/sucrose/gstreamer-0_10-plugins-espeak/SPECS/gstreamer0.10-espeak.spec
+++ /dev/null
@@ -1,74 +0,0 @@
-# NOTE: Do not edit, file was generated by jhconvert
-
-Name: gstreamer0.10-espeak
-Version: 0.3.1
-%if 0%{?suse_version}
-Release: 1
-%else
-Release:        1%{?dist}
-%endif
-
-Summary: Simple gstreamer plugin to use espeak by way of sound source
-License: LGPLv2+
-Group: Sound
-Url: http://sugarlabs.org/go/DevelopmentTeam/gst-plugins-espeak
-
-Source: http://download.sugarlabs.org/sources/honey/gst-plugins-espeak/gst-plugins-espeak-0.3.1.tar.bz2
-
-Requires: espeak  
-Requires: gstreamer-0_10-plugins-base  
-Requires: gstreamer-0_10-plugins-good  
-Requires: gstreamer  
-
-BuildRequires: libespeak-devel  
-BuildRequires: libgstreamer-plugins-base-devel  
-BuildRequires: libgstreamer-devel  
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-Simple gstreamer plugin to use espeak by way of sound source.
-It was developed to simplify espeak usage in Sugar Speak activity.
-
-%prep
-%setup -q -n gst-plugins-espeak-0.3.1
-
-
-# eliminate %%configure's "clever" behaviour
-%define __libtoolize true
-
-%build
-%configure 
-make 
-
-%install
-rm -rf %{buildroot}
-make  \
-	install \
-	DESTDIR=%{buildroot}
-
-
-%clean
-rm -rf %{buildroot}
-
-%files 
-%defattr(-,root,root,-)
-%{_libdir}/gstreamer*/*
-%doc AUTHORS COPYING NEWS README
-
-
-
-%changelog
-* Sat Mar 21 2009 Aleksey Lim <alsroot@mandriva.org> 0.3.1-1mdv2009.1
-+ Revision: 360049
-- update version to 0.3.1
-
-* Fri Mar 13 2009 Aleksey Lim <alsroot@mandriva.org> 0.3-1mdv2009.1
-+ Revision: 354524
-- update to 0.3 release
-- update to new version 0.2
-
-* Tue Feb 17 2009 Aleksey Lim <alsroot@mandriva.org> 0.1-1mdv2009.1
-+ Revision: 341766
-- Initial commit
-
diff --git a/0.84/sucrose/python-hulahop/SOURCES/python-hulahop-0.4.9-sugar-hulahop-configure.patch b/0.84/sucrose/python-hulahop/SOURCES/python-hulahop-0.4.9-sugar-hulahop-configure.patch
new file mode 100644
index 0000000..10cfa02
--- /dev/null
+++ b/0.84/sucrose/python-hulahop/SOURCES/python-hulahop-0.4.9-sugar-hulahop-configure.patch
@@ -0,0 +1,11 @@
+--- hulahop-0.4.5/configure.ac.orig	2008-09-06 15:40:44.000000000 +0000
++++ hulahop-0.4.5/configure.ac	2008-12-18 21:17:41.000000000 +0000
+@@ -39,7 +40,7 @@
+ LIBXUL_DIR="`dirname $LIBXUL_SDK_DIR`/xulrunner-`$PKG_CONFIG --modversion libxul`"
+ LIBXUL_LIBS="$LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom"
+ 
+-LIBXUL_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul`
++LIBXUL_CFLAGS="$LIBXUL_CFLAGS `$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul`"
+ 
+ AC_SUBST([LIBXUL_CFLAGS])
+ AC_SUBST([LIBXUL_LIBS])
diff --git a/0.84/sucrose/python-hulahop/SOURCES/python-hulahop-0.4.9-sugar-hulahop-libs.patch b/0.84/sucrose/python-hulahop/SOURCES/python-hulahop-0.4.9-sugar-hulahop-libs.patch
new file mode 100644
index 0000000..fcbf6a8
--- /dev/null
+++ b/0.84/sucrose/python-hulahop/SOURCES/python-hulahop-0.4.9-sugar-hulahop-libs.patch
@@ -0,0 +1,11 @@
+--- hulahop-0.4.9/configure.ac.orig	2009-04-23 04:42:06.000000000 -0400
++++ hulahop-0.4.9/configure.ac	2009-04-23 04:42:40.000000000 -0400
+@@ -39,7 +39,7 @@
+ # to link to xpcom at build time. Which involves various hacks.
+ LIBXUL_SDK_DIR=`$PKG_CONFIG --variable=sdkdir libxul`
+ LIBXUL_DIR="`dirname $LIBXUL_SDK_DIR`/xulrunner-`$PKG_CONFIG --modversion libxul`"
+-LIBXUL_LIBS="$LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom"
++LIBXUL_LIBS="-L`$PKG_CONFIG --variable=sdkdir libxul` -lsqlite3 -lmozjs $LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom"
+ 
+ LIBXUL_CFLAGS="$LIBXUL_CFLAGS `$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul`"
+ 
diff --git a/deps/python-hulahop/SPECS/python-hulahop.changes b/0.84/sucrose/python-hulahop/SPECS/python-hulahop.changes
index d37dda9..d37dda9 100644
--- a/deps/python-hulahop/SPECS/python-hulahop.changes
+++ b/0.84/sucrose/python-hulahop/SPECS/python-hulahop.changes
diff --git a/0.84/sucrose/python-hulahop/SPECS/python-hulahop.spec b/0.84/sucrose/python-hulahop/SPECS/python-hulahop.spec
new file mode 100644
index 0000000..176339a
--- /dev/null
+++ b/0.84/sucrose/python-hulahop/SPECS/python-hulahop.spec
@@ -0,0 +1,66 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: python-hulahop
+Version: 0.4.9
+Release: 2
+Summary: A pygtk widget for embedding mozilla
+License: LGPL
+Group: Development/Python
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/hulahop/hulahop-0.4.9.tar.bz2
+
+Patch: python-hulahop-0.4.9-sugar-hulahop-configure.patch
+Patch1: python-hulahop-0.4.9-sugar-hulahop-libs.patch
+
+Requires: python-gobject2  
+Requires: python-gtk  
+Requires: python  
+Requires: python-xpcom  
+
+BuildRequires: gtk2-devel  
+BuildRequires: python-gobject2-devel  
+BuildRequires: python-gtk-devel  
+BuildRequires: python-devel  
+BuildRequires: python-xpcom  
+BuildRequires: mozilla-xulrunner190-devel >= 1.9
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+The hulalop library contains a widget for embedding mozilla.
+It's based on pyxpcom and give access to the whole mozilla
+xpcom API through python.
+
+%prep
+%setup -q -n hulahop-0.4.9
+%patch -p1
+%patch1 -p1
+
+%build
+libtoolize -fc
+autoreconf -vf
+%configure  \
+	--disable-static
+make 
+
+%install
+rm -rf %{buildroot}
+make  \
+	install \
+	DESTDIR=%{buildroot}
+%fdupes -s %{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_datadir}/*
+%{_libdir}/hulahop
+%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
+%doc COPYING NEWS
+
+%changelog
+
diff --git a/0.84/sucrose/sugar-browse/SOURCES/sugar-browse-108-sugar-456.patch b/0.84/sucrose/sugar-browse/SOURCES/sugar-browse-108-sugar-456.patch
new file mode 100644
index 0000000..ceccbbf
--- /dev/null
+++ b/0.84/sucrose/sugar-browse/SOURCES/sugar-browse-108-sugar-456.patch
@@ -0,0 +1,20 @@
+diff --git a/webactivity.py b/webactivity.py
+index a7c55bb..414b6c5 100644
+--- a/webactivity.py
++++ b/webactivity.py
+@@ -31,9 +31,12 @@ import sqlite3
+ import cjson
+ import gconf
+ 
+-# HACK: Needed by http://dev.sugarlabs.org/ticket/456
+-import gnome
+-gnome.init('Hulahop', '1.0')
++try:
++    # HACK: Needed by http://dev.sugarlabs.org/ticket/456
++    import gnome
++    gnome.init('Hulahop', '1.0')
++except:
++    pass
+ 
+ from sugar.activity import activity
+ from sugar.graphics import style
diff --git a/0.84/sucrose/sugar-browse/SPECS/sugar-browse.spec b/0.84/sucrose/sugar-browse/SPECS/sugar-browse.spec
new file mode 100644
index 0000000..952cce3
--- /dev/null
+++ b/0.84/sucrose/sugar-browse/SPECS/sugar-browse.spec
@@ -0,0 +1,60 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-browse
+Version: 108
+Release: 1
+Summary: Browse activity for Sugar
+License: GPLv2+
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Browse/Browse-108.tar.bz2
+
+Patch: sugar-browse-108-sugar-456.patch
+
+Requires: python-hulahop >= 0.4.9
+Requires: python  
+Requires: python-cjson  
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: python-devel  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+%description
+Browse is a Web browser built on Xulrunner and thus uses the same
+Gecko rendering engine as Firefox.
+
+%prep
+%setup -q -n Browse-108
+%patch -p1
+
+%build
+python  \
+	setup.py \
+	build
+
+%install
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
+%find_lang org.laptop.WebActivity
+
+%clean
+rm -rf %{buildroot}
+
+%files -f org.laptop.WebActivity.lang
+%defattr(-,root,root,-)
+%{_datadir}/sugar/activities/*
+%doc AUTHORS COPYING
+
+%changelog
+
diff --git a/0.84/sucrose/sugar-calculate/SPECS/sugar-calculate.spec b/0.84/sucrose/sugar-calculate/SPECS/sugar-calculate.spec
new file mode 100644
index 0000000..73ba5fa
--- /dev/null
+++ b/0.84/sucrose/sugar-calculate/SPECS/sugar-calculate.spec
@@ -0,0 +1,56 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-calculate
+Version: 29
+Release: 1
+Summary: Calculate activity for Sugar
+License: GPLv2+
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Calculate/Calculate-29.tar.bz2
+
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+%description
+The calculate activity provides a generic calculator.
+The interface provides the simplest functions directly and should therefore
+be easy to usen for the youngest children. However, it does support more
+complicated math and variables.
+
+%prep
+%setup -q -n Calculate-29
+
+
+%build
+python  \
+	setup.py \
+	build
+
+%install
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
+%find_lang org.laptop.Calculate
+
+%clean
+rm -rf %{buildroot}
+
+%files -f org.laptop.Calculate.lang
+%defattr(-,root,root,-)
+%{_datadir}/sugar/activities/*
+%doc NEWS AUTHORS COPYING NEWS
+
+%changelog
+
diff --git a/0.84/sucrose/sugar-chat/SPECS/sugar-chat.spec b/0.84/sucrose/sugar-chat/SPECS/sugar-chat.spec
new file mode 100644
index 0000000..073094a
--- /dev/null
+++ b/0.84/sucrose/sugar-chat/SPECS/sugar-chat.spec
@@ -0,0 +1,60 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-chat
+Version: 65
+Release: 1
+Summary: Instant messaging client for Sugar
+License: GPLv2+
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Chat/Chat-65.tar.bz2
+
+Requires: python-simplejson  
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+%description
+The Chat activity will provide a simple interface for collaborative discussion,
+be it between two individuals or among a group as large as an entire classroom.
+While a lightweight and 'impermanent' chat will be provided in a layer above
+all activities and the various mesh levels, this activity devoted to textual
+communication will keep detailed records of the conversation within the journal
+and provide a means of searching through the conversation to locate
+important comments.
+
+%prep
+%setup -q -n Chat-65
+
+
+%build
+python  \
+	setup.py \
+	build
+
+%install
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
+%find_lang org.laptop.Chat
+
+%clean
+rm -rf %{buildroot}
+
+%files -f org.laptop.Chat.lang
+%defattr(-,root,root,-)
+%{_datadir}/sugar/activities/*
+%doc AUTHORS COPYING NEWS
+
+%changelog
+
diff --git a/0.84/sucrose/sugar-etoys/SOURCES/sugar-etoys-101-sugar-795.patch b/0.84/sucrose/sugar-etoys/SOURCES/sugar-etoys-101-sugar-795.patch
new file mode 100644
index 0000000..1a7c468
--- /dev/null
+++ b/0.84/sucrose/sugar-etoys/SOURCES/sugar-etoys-101-sugar-795.patch
@@ -0,0 +1,6 @@
+--- /dev/null	2009-04-20 13:29:33.360489467 +0000
++++ Etoys-101/setup.py	2009-04-23 21:11:27.000000000 +0000
+@@ -0,0 +1,3 @@
++#!/usr/bin/python
++from sugar.activity import bundlebuilder
++bundlebuilder.start()
diff --git a/0.84/sucrose/sugar-etoys/SPECS/sugar-etoys.spec b/0.84/sucrose/sugar-etoys/SPECS/sugar-etoys.spec
new file mode 100644
index 0000000..01e4fa7
--- /dev/null
+++ b/0.84/sucrose/sugar-etoys/SPECS/sugar-etoys.spec
@@ -0,0 +1,62 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-etoys
+Version: 101
+Release: 1
+Summary: Squeak Etoys activity for Sugar
+License: MIT/Apache
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Etoys/Etoys-101.tar.gz
+
+Patch: sugar-etoys-101-sugar-795.patch
+
+Requires: etoys >= 4.0.2212
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+%description
+Squeak Etoys was inspired by LOGO, PARC-Smalltalk, Hypercard, starLOGO
+and AgentSheets. It is a media-rich authoring environment with a simple,
+powerful scripted object model for many kinds of objects created by end-users
+that runs on many platforms, and it is free and open source. It includes 2D and
+3D graphics, images, text, particles, presentations, web-pages, videos, sound
+and MIDI, etc. It includes the ability to share desktops with other Etoy users
+in real-time, so many forms of immersive mentoring and play can be done over
+the Internet.
+
+%prep
+%setup -q -n Etoys-101
+%patch -p1
+
+%build
+python  \
+	setup.py \
+	build
+
+%install
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
+
+
+%clean
+rm -rf %{buildroot}
+
+%files 
+%defattr(-,root,root,-)
+%{_datadir}/sugar/activities/*
+%doc COPYING NEWS
+
+%changelog
+
diff --git a/0.84/sucrose/sugar-fructose/SPECS/sugar-fructose.ymp b/0.84/sucrose/sugar-fructose/SPECS/sugar-fructose.ymp
new file mode 100644
index 0000000..80c33af
--- /dev/null
+++ b/0.84/sucrose/sugar-fructose/SPECS/sugar-fructose.ymp
@@ -0,0 +1,162 @@
+<!--NOTE: Do not edit, file was generated by jhconvert-->
+
+<metapackage xmlns:os="http://opensuse.org/Standards/One_Click_Install" xmlns="http://opensuse.org/Standards/One_Click_Install">
+  <group>
+    <name>sugar-fructose</name>
+    <summary>Core Sugar activities</summary>
+    <description>This virtual package depends on core Sugar activities that follow the Sugarlabs
+six months release schedule.
+Sugar is a graphical user interface aimed at children which promotes sharing
+and collaborative learning. It was introduced on the One Laptop Per Child
+(OLPC) XO laptop but is useful on other devices as well.</description>
+    <repositories>
+      <repository recommended="true">
+        <name>X11:Sugar</name>
+        <summary>Sugar is the core of the OLPC Human Interface.</summary>
+        <description>Sugar is the core of the OLPC Human Interface. Its goal is to turn the Laptop into a fun, easy to use, social experience that promotes sharing and learning.
+
+Sugar reinvents how computers can be used for education. Sugar promotes sharing, collaborative learning, and reflection. Through Sugar's clarity of design, children and their teachers have the opportunity to use computation on their own terms; they are free to reshape, reinvent, and reapply both software and content into powerful learning activities. Sugar is a community project; it is based on GNU/Linux, a free and open-source operating system.</description>
+        <url>http://download.opensuse.org/repositories/X11:/Sugar/openSUSE_11.1/</url>
+      </repository>
+      <repository recommended="true">
+        <name>openSUSE:11.1:Update</name>
+        <summary>Official Released Updates For openSUSE 11.1</summary>
+        <description></description>
+        <url>http://download.opensuse.org/update/11.1/</url>
+      </repository>
+      <repository recommended="true">
+        <name>openSUSE:11.1</name>
+        <summary>The openSUSE 11.1 distribution</summary>
+        <description>The openSUSE 11.1 distribution
+
+rpm and iso file downloads are disabled by intention, please use our
+official released RCs from the download mirrors.
+</description>
+        <url>http://download.opensuse.org/distribution/11.1/repo/oss/</url>
+      </repository>
+      <repository recommended="true">
+        <name>devel:languages:python</name>
+        <summary>Python and Python Modules</summary>
+        <description>This project provides Python and Python modules.
+</description>
+        <url>http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_11.1/</url>
+      </repository>
+    </repositories>
+    <software>
+              <item>
+        <name>sugar-calculate</name>
+        <summary>Calculate activity for Sugar</summary>
+        <description>The calculate activity provides a generic calculator.
+The interface provides the simplest functions directly and should therefore
+be easy to usen for the youngest children. However, it does support more
+complicated math and variables.</description>
+      </item>
+
+      <item>
+        <name>sugar-chat</name>
+        <summary>Instant messaging client for Sugar</summary>
+        <description>The Chat activity will provide a simple interface for collaborative discussion,
+be it between two individuals or among a group as large as an entire classroom.
+While a lightweight and 'impermanent' chat will be provided in a layer above
+all activities and the various mesh levels, this activity devoted to textual
+communication will keep detailed records of the conversation within the journal
+and provide a means of searching through the conversation to locate
+important comments.</description>
+      </item>
+
+      <item>
+        <name>sugar-etoys</name>
+        <summary>Squeak Etoys activity for Sugar</summary>
+        <description>Squeak Etoys was inspired by LOGO, PARC-Smalltalk, Hypercard, starLOGO
+and AgentSheets. It is a media-rich authoring environment with a simple,
+powerful scripted object model for many kinds of objects created by end-users
+that runs on many platforms, and it is free and open source. It includes 2D and
+3D graphics, images, text, particles, presentations, web-pages, videos, sound
+and MIDI, etc. It includes the ability to share desktops with other Etoy users
+in real-time, so many forms of immersive mentoring and play can be done over
+the Internet.</description>
+      </item>
+
+      <item>
+        <name>sugar-imageviewer</name>
+        <summary>Image viewer activity for Sugar</summary>
+        <description>Image viewer activity for Sugar.</description>
+      </item>
+
+      <item>
+        <name>sugar-jukebox</name>
+        <summary>Audio and video player for Sugar</summary>
+        <description>Audio and video player for Sugar.</description>
+      </item>
+
+      <item>
+        <name>sugar-log</name>
+        <summary>Log activity for Sugar</summary>
+        <description>Log is an activity for developers to examine the log files that are generated
+by system software and other activities. Logs can also be uploaded to servers
+to allow support staff to assist with troubleshooting.</description>
+      </item>
+
+      <item>
+        <name>sugar-pippy</name>
+        <summary>Python programming activity for Sugar</summary>
+        <description>Teaches Python programming by providing access to Python code samples
+and a fully interactive Python interpreter.
+The user can type and execute simple Python expressions. For example,
+it would be possible for a user to write Python statements to calculate
+expressions, play sounds, or make simple text animation.
+The initial build ships with about twenty short Python examples covering
+various aspects of the language.</description>
+      </item>
+
+      <item>
+        <name>sugar-read</name>
+        <summary>Read activity for Sugar</summary>
+        <description>Read activity for Sugar</description>
+      </item>
+
+      <item>
+        <name>sugar-toolkit</name>
+        <summary>Sugar toolkit</summary>
+        <description>The toolkit provides a set of widgets to build HIG compliant applications
+and interfaces to interact with system services like presence
+and the datastore.</description>
+      </item>
+
+      <item>
+        <name>sugar-terminal</name>
+        <summary>Terminal for Sugar</summary>
+        <description>The terminal activity provides a vte-based terminal for the Sugar interface.</description>
+      </item>
+
+      <item>
+        <name>sugar-turtleart</name>
+        <summary>Pseudo-Logo graphical programming language for Sugar</summary>
+        <description>Turtle Art is an activity with a Logo-inspired graphical "turtle"
+that draws colorful art based on Scratch-like snap-together visual
+programming elements.
+There are many restrictions compared to LOGO. The two allowed user-defined
+procedures can't have parameters. Only two numeric global variables
+are available, no lists or other data-structures. You can't make user defined
+functions which return a value. The conditionals and some of the functions
+only take constants or variables, not expressions. Limited screen real-estate
+makes building large programs unfeasible.</description>
+      </item>
+
+      <item>
+        <name>sugar-browse</name>
+        <summary>Browse activity for Sugar</summary>
+        <description>Browse is a Web browser built on Xulrunner and thus uses the same
+Gecko rendering engine as Firefox.</description>
+      </item>
+
+      <item>
+        <name>sugar-write</name>
+        <summary>Word processor for Sugar</summary>
+        <description>The Write activity provides a word processor for the Sugar interface.</description>
+      </item>
+
+    </software>
+  </group>
+</metapackage>
+
diff --git a/0.84/sucrose/sugar-glucose/SPECS/sugar-glucose.ymp b/0.84/sucrose/sugar-glucose/SPECS/sugar-glucose.ymp
new file mode 100644
index 0000000..a363279
--- /dev/null
+++ b/0.84/sucrose/sugar-glucose/SPECS/sugar-glucose.ymp
@@ -0,0 +1,94 @@
+<!--NOTE: Do not edit, file was generated by jhconvert-->
+
+<metapackage xmlns:os="http://opensuse.org/Standards/One_Click_Install" xmlns="http://opensuse.org/Standards/One_Click_Install">
+  <group>
+    <name>sugar-glucose</name>
+    <summary>Core Sugar components</summary>
+    <description>Virtual package of core Sugar components that follow the Sugarlabs
+six months release schedule.
+Sugar is a graphical user interface aimed at children which promotes sharing
+and collaborative learning. It was introduced on the One Laptop Per Child
+(OLPC) XO laptop but is useful on other devices as well.</description>
+    <repositories>
+      <repository recommended="true">
+        <name>X11:Sugar</name>
+        <summary>Sugar is the core of the OLPC Human Interface.</summary>
+        <description>Sugar is the core of the OLPC Human Interface. Its goal is to turn the Laptop into a fun, easy to use, social experience that promotes sharing and learning.
+
+Sugar reinvents how computers can be used for education. Sugar promotes sharing, collaborative learning, and reflection. Through Sugar's clarity of design, children and their teachers have the opportunity to use computation on their own terms; they are free to reshape, reinvent, and reapply both software and content into powerful learning activities. Sugar is a community project; it is based on GNU/Linux, a free and open-source operating system.</description>
+        <url>http://download.opensuse.org/repositories/X11:/Sugar/openSUSE_11.1/</url>
+      </repository>
+      <repository recommended="true">
+        <name>openSUSE:11.1:Update</name>
+        <summary>Official Released Updates For openSUSE 11.1</summary>
+        <description></description>
+        <url>http://download.opensuse.org/update/11.1/</url>
+      </repository>
+      <repository recommended="true">
+        <name>openSUSE:11.1</name>
+        <summary>The openSUSE 11.1 distribution</summary>
+        <description>The openSUSE 11.1 distribution
+
+rpm and iso file downloads are disabled by intention, please use our
+official released RCs from the download mirrors.
+</description>
+        <url>http://download.opensuse.org/distribution/11.1/repo/oss/</url>
+      </repository>
+      <repository recommended="true">
+        <name>devel:languages:python</name>
+        <summary>Python and Python Modules</summary>
+        <description>This project provides Python and Python modules.
+</description>
+        <url>http://download.opensuse.org/repositories/devel:/languages:/python/openSUSE_11.1/</url>
+      </repository>
+    </repositories>
+    <software>
+              <item>
+        <name>sugar-artwork</name>
+        <summary>Artwork for Sugar look-and-feel</summary>
+        <description>Contains the themes and icons that make up the Sugar default look and feel.</description>
+      </item>
+
+      <item>
+        <name>sugar-datastore</name>
+        <summary>Datastore service for Sugar</summary>
+        <description>This package contains a simple log like datastore able to connect with multiple
+backends. The datastore supports connecting and disconnecting from backends
+on the fly to help the support the limit space/memory characteristics and
+the fact that network services may become unavailable at times.</description>
+      </item>
+
+      <item>
+        <name>sugar-presence-service</name>
+        <summary>The Sugar presence service</summary>
+        <description>The Sugar presence service.</description>
+      </item>
+
+      <item>
+        <name>sugar</name>
+        <summary>Sugar window manager</summary>
+        <description>This package contains the base modules for Sugar.
+Sugar is a graphical user interface aimed at children which promotes sharing
+and collaborative learning. It was introduced on the One Laptop Per Child
+(OLPC) XO laptop but is useful on other devices as well.</description>
+      </item>
+
+      <item>
+        <name>sugar-base</name>
+        <summary>Base Sugar library</summary>
+        <description>The base libary for Sugar. It provides helpers for the development
+of services and activities.</description>
+      </item>
+
+      <item>
+        <name>sugar-toolkit</name>
+        <summary>Sugar toolkit</summary>
+        <description>The toolkit provides a set of widgets to build HIG compliant applications
+and interfaces to interact with system services like presence
+and the datastore.</description>
+      </item>
+
+    </software>
+  </group>
+</metapackage>
+
diff --git a/0.84/sucrose/sugar-imageviewer/SPECS/sugar-imageviewer.spec b/0.84/sucrose/sugar-imageviewer/SPECS/sugar-imageviewer.spec
index 7f30ab3..f3f37ad 100644
--- a/0.84/sucrose/sugar-imageviewer/SPECS/sugar-imageviewer.spec
+++ b/0.84/sucrose/sugar-imageviewer/SPECS/sugar-imageviewer.spec
@@ -1,70 +1,53 @@
-Name:           sugar-imageviewer
-Version:        7
-%if 0%{?suse_version}
-Release: 1
-%else
-Release:        1%{?dist}
-%endif
-Summary:        Simple Image viewer for Sugar
+# NOTE: Do not edit, file was generated by jhconvert
 
-Group:          Sugar/Activities
-License:        GPLv2+
-URL:            http://wiki.laptop.org/go/Image_Viewer
-Source0:        http://download.sugarlabs.org/sources/sucrose/fructose/ImageViewer/ImageViewer-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:      noarch
+Name: sugar-imageviewer
+Version: 7
+Release: 2
+Summary: Image viewer activity for Sugar
+License: GPL
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
 
-BuildRequires:  python
-BuildRequires:  sugar-toolkit
-BuildRequires:  sugar-activities
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/ImageViewer/ImageViewer-7.tar.bz2
 
-Requires:       sugar-activities
-Requires:       sugar
+Requires: sugar-toolkit >= 0.84.4
 
+BuildRequires: gettext  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
-The Image Viewer activity is a simple and fast image viewer tool for Sugar.
-It has features one would expect of a standard image viewer, like zoom,
-rotate, etc. 
+Image viewer activity for Sugar.
 
 %prep
-%setup -q -n ImageViewer-%{version}
+%setup -q -n ImageViewer-7
+
 
 %build
-python ./setup.py build
+python  \
+	setup.py \
+	build
 
 %install
 rm -rf %{buildroot}
-python ./setup.py install --prefix=%{buildroot}/%{_prefix}
-
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
 %find_lang org.laptop.ImageViewerActivity
 
-
 %clean
-rm -rf  %{buildroot}
-
+rm -rf %{buildroot}
 
 %files -f org.laptop.ImageViewerActivity.lang
 %defattr(-,root,root,-)
+%{_datadir}/sugar/activities/*
 %doc AUTHORS COPYING NEWS
-%{sugaractivitydir}/ImageViewer.activity/
-
 
 %changelog
-* Tue Mar 24 2009 Simon Schampijer <simon@schampijer.de> - 7-1
-- Fix initial zoom level being extremely small: d.sl.o #486 (Tomeu)
-- New German translation
-- give full source url
-
-* Wed Mar 04 2009 Simon Schampijer <simon@schampijer.de> - 6-2
-- Rebuild with correct source name
-
-* Wed Mar 04 2009 Simon Schampijer <simon@schampijer.de> - 6-1
-- Remove hacks needed because of d.sl.o (Tomeu) #258
-- New languages and translations 
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Mon Dec 29 2008 Fabian Affolter <fabian@bernewireless.net> - 5-1
-- Initial package for Fedora
diff --git a/0.84/sucrose/sugar-jukebox/SPECS/sugar-jukebox.spec b/0.84/sucrose/sugar-jukebox/SPECS/sugar-jukebox.spec
index 4fa80d0..a4662c8 100644
--- a/0.84/sucrose/sugar-jukebox/SPECS/sugar-jukebox.spec
+++ b/0.84/sucrose/sugar-jukebox/SPECS/sugar-jukebox.spec
@@ -1,78 +1,54 @@
-Name:		sugar-jukebox
-Version:	8
-%if 0%{?suse_version}
-Release: 1
-%else
-Release:        1%{?dist}
-%endif
-Summary:	Media player activity for Sugar
+# NOTE: Do not edit, file was generated by jhconvert
 
-Group:		Sugar/Activities
-License:	GPLv2+
-URL:		http://wiki.laptop.org/go/Jukebox
-Source0:	http://download.sugarlabs.org/sources/sucrose/fructose/Jukebox/Jukebox-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: sugar-jukebox
+Version: 8
+Release: 2
+Summary: Audio and video player for Sugar
+License: GPLv2
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
 
-BuildRequires:	python sugar-toolkit
-BuildRequires:	sugar-activities
-BuildArch:	noarch
-Requires:	sugar
-Requires:	sugar-activities
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Jukebox/Jukebox-8.tar.bz2
 
-%description
-The jukebox activity is an audio/video player that will play
-different kind of files bases on the installed gstreamer plugins.
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: gstreamer-0_10-plugins-base  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+%description
+Audio and video player for Sugar.
 
 %prep
-%setup -q -n Jukebox-%{version}
+%setup -q -n Jukebox-8
 
 
 %build
-python ./setup.py build
-
+python  \
+	setup.py \
+	build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
-
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
 %find_lang org.laptop.sugar.Jukebox
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files -f org.laptop.sugar.Jukebox.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS MANIFEST TODO
-%{sugaractivitydir}/Jukebox.activity/
-
+%{_datadir}/sugar/activities/*
+%doc AUTHORS COPYING NEWS TODO
 
 %changelog
-* Mon Apr 06 2009 Sebastian Dziallas <sebastian@when.com> - 8-1
-- update to version 8
-
-* Wed Mar 04 2009 Sebastian Dziallas <sebastian@when.com> - 7-1
-- update to version 7
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Dec 18 2008 Sebastian Dziallas <sebastian@when.com> - 6-1
-- update to version 6
-
-* Mon Nov 24 2008 Sebastian Dziallas <sebastian@when.com> - 5-3
-- use git checkout script
-
-* Wed Nov 19 2008 Sebastian Dziallas <sebastian@when.com> - 5-2
-- modify build section and source path
-
-* Thu Nov 13 2008 Sebastian Dziallas <sebastian@when.com> - 5-1
-- update to version 5
-
-* Tue Nov 11 2008 Sebastian Dziallas <sebastian@when.com> - 4-1
-- update to version 4
 
-* Wed Oct 22 2008 Sebastian Dziallas <sebastian@when.com> - 3-1
-- Initial Packaging
diff --git a/0.84/sucrose/sugar-log/SPECS/sugar-log.spec b/0.84/sucrose/sugar-log/SPECS/sugar-log.spec
new file mode 100644
index 0000000..46e9846
--- /dev/null
+++ b/0.84/sucrose/sugar-log/SPECS/sugar-log.spec
@@ -0,0 +1,57 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-log
+Version: 18
+Release: 1
+Summary: Log activity for Sugar
+License: GPL
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Log/Log-18.tar.bz2
+
+Requires: gnome-vfs2  
+Requires: gnome-vfs2  
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+%description
+Log is an activity for developers to examine the log files that are generated
+by system software and other activities. Logs can also be uploaded to servers
+to allow support staff to assist with troubleshooting.
+
+%prep
+%setup -q -n Log-18
+
+
+%build
+python  \
+	setup.py \
+	build
+
+%install
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
+%find_lang org.laptop.Log
+
+%clean
+rm -rf %{buildroot}
+
+%files -f org.laptop.Log.lang
+%defattr(-,root,root,-)
+%{_datadir}/sugar/activities/*
+%doc COPYING NEWS
+
+%changelog
+
diff --git a/0.84/sucrose/sugar-pippy/SOURCES/sugar-pippy-25-olpc-4218.patch b/0.84/sucrose/sugar-pippy/SOURCES/sugar-pippy-25-olpc-4218.patch
new file mode 100644
index 0000000..e3f70be
--- /dev/null
+++ b/0.84/sucrose/sugar-pippy/SOURCES/sugar-pippy-25-olpc-4218.patch
@@ -0,0 +1,34 @@
+--- Pippy-25/pippy_app.py.orig	2008-06-10 15:43:33.000000000 +0000
++++ Pippy-25/pippy_app.py	2008-11-22 04:23:29.000000000 +0000
+@@ -83,7 +83,7 @@
+         treecolumn = gtk.TreeViewColumn(_("Examples"), cellrenderer, text=1)
+         treeview.get_selection().connect("changed", self.selection_cb)
+         treeview.append_column(treecolumn)
+-        treeview.set_size_request(220, 900)
++        treeview.set_size_request(270, 900)
+ 
+         # Create scrollbars around the view.
+         scrolled = gtk.ScrolledWindow()
+@@ -159,19 +159,19 @@
+         gobutton = gtk.Button(label=_("_Run!"))
+         gobutton.set_image(goicon)
+         gobutton.connect('clicked', self.gobutton_cb)
+-        gobutton.set_size_request(650, 2)
++        gobutton.set_size_request(550, -1)
+         buttonhbox.pack_start(gobutton)
+ 
+         # The "stop" button
+         stopbutton = gtk.Button(stock=gtk.STOCK_STOP)
+         stopbutton.connect('clicked', self.stopbutton_cb)
+-        stopbutton.set_size_request(200, 2)
++        stopbutton.set_size_request(200, -1)
+         buttonhbox.pack_start(stopbutton)
+ 
+         # The "clear" button
+         clearbutton = gtk.Button(stock=gtk.STOCK_CLEAR)
+         clearbutton.connect('clicked', self.clearbutton_cb)
+-        clearbutton.set_size_request(150, 2)
++        clearbutton.set_size_request(150, -1)
+         buttonhbox.pack_end(clearbutton)
+ 
+         vbox.pack_start(buttonhbox)
diff --git a/0.84/sucrose/sugar-pippy/SPECS/sugar-pippy.spec b/0.84/sucrose/sugar-pippy/SPECS/sugar-pippy.spec
new file mode 100644
index 0000000..5505582
--- /dev/null
+++ b/0.84/sucrose/sugar-pippy/SPECS/sugar-pippy.spec
@@ -0,0 +1,64 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-pippy
+Version: 25
+Release: 1
+Summary: Python programming activity for Sugar
+License: GPL
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
+
+Source: http://dev.laptop.org/pub/sugar/sources/Pippy/Pippy-25.tar.bz2
+
+Patch: sugar-pippy-25-olpc-4218.patch
+
+Requires: python-gtksourceview  
+Requires: python  
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: python-devel  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+%description
+Teaches Python programming by providing access to Python code samples
+and a fully interactive Python interpreter.
+The user can type and execute simple Python expressions. For example,
+it would be possible for a user to write Python statements to calculate
+expressions, play sounds, or make simple text animation.
+The initial build ships with about twenty short Python examples covering
+various aspects of the language.
+
+%prep
+%setup -q -n Pippy-25
+%patch -p1
+
+%build
+python  \
+	setup.py \
+	build
+
+%install
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
+%find_lang org.laptop.Pippy
+
+%clean
+rm -rf %{buildroot}
+
+%files -f org.laptop.Pippy.lang
+%defattr(-,root,root,-)
+%{_datadir}/sugar/activities/*
+%doc NEWS
+
+%changelog
+
diff --git a/0.84/sucrose/sugar-read/SPECS/sugar-read..changes b/0.84/sucrose/sugar-read/SPECS/sugar-read..changes
deleted file mode 100644
index ceeba24..0000000
--- a/0.84/sucrose/sugar-read/SPECS/sugar-read..changes
+++ /dev/null
@@ -1,5 +0,0 @@
--------------------------------------------------------------------
-Sun Apr 19 07:51:51 CEST 2009 - dvanassche@gmail.com
-
-- 
-
diff --git a/0.84/sucrose/sugar-read/SPECS/sugar-read.spec b/0.84/sucrose/sugar-read/SPECS/sugar-read.spec
index 73810e6..02b3ae9 100644
--- a/0.84/sucrose/sugar-read/SPECS/sugar-read.spec
+++ b/0.84/sucrose/sugar-read/SPECS/sugar-read.spec
@@ -1,62 +1,54 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
 Name: sugar-read
-Version: 66
-%if 0%{?suse_version}
+Version: 67
 Release: 1
-%else
-Release: 1%{?dist}
-%endif
-Summary: A document reader for Sugar
+Summary: Read activity for Sugar
+License: GPL
 Group: Sugar/Activities
-License: GPLv2+
-URL: http://wiki.laptop.org/go/Read
-Source0: http://download.sugarlabs.org/sources/sucrose/fructose/Read/Read-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Read/Read-67.tar.bz2
 
-BuildRequires: python
-BuildRequires: sugar-toolkit
-BuildRequires: sugar-activities
-Requires: gnome-python-desktop
-Requires: sugar-activities
+Requires: python-evince >= 2.24.1
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 %description
-The Read activity allows the laptop to act as a book reader. It has a
-simple interface, and will view many kinds of text and image-based book-
-like materials. It will have particular strengths in handheld mode, with
-extremely low power consumption and simple navigation controls.
-
-Read can read PDF files, single-page TIFF files, and also read DJVU files.
+Read activity for Sugar
 
 %prep
-%setup -q -n Read-%{version}
+%setup -q -n Read-67
+
 
 %build
-python ./setup.py build
+python  \
+	setup.py \
+	build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
-./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
-
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
 %find_lang org.laptop.sugar.ReadActivity
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f org.laptop.sugar.ReadActivity.lang
 %defattr(-,root,root,-)
-%doc COPYING AUTHORS
-%{sugaractivitydir}/Read.activity/
-
+%{_datadir}/sugar/activities/*
+%doc AUTHORS COPYING
 
 %changelog
-* Mon Apr 06 2009 Simon Schampijer <simon@schampijer.de> - 66-1
-- Support evince binding w/o document_links support #703
-- Update translations
-
-* Fri Mar 06 2009 Simon Schampijer <simon@schampijer.de> - 65-2
-- make dependency only on gnome-python2-evince to not drag in 
-  all gnome-python
 
-* Wed Mar 04 2009 Simon Schampijer <simon@schampijer.de> - 65-1
-- Initial packaging
diff --git a/0.84/sucrose/sugar-terminal/SPECS/sugar-terminal.spec b/0.84/sucrose/sugar-terminal/SPECS/sugar-terminal.spec
new file mode 100644
index 0000000..6fbb86c
--- /dev/null
+++ b/0.84/sucrose/sugar-terminal/SPECS/sugar-terminal.spec
@@ -0,0 +1,55 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-terminal
+Version: 25
+Release: 1
+Summary: Terminal for Sugar
+License: GPLv2+
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Terminal/Terminal-25.tar.bz2
+
+Requires: python-simplejson  
+Requires: sugar-toolkit >= 0.84.4
+Requires: vte >= 0.17
+
+BuildRequires: gettext  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+%description
+The terminal activity provides a vte-based terminal for the Sugar interface.
+
+%prep
+%setup -q -n Terminal-25
+
+
+%build
+python  \
+	setup.py \
+	build
+
+%install
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
+%find_lang org.laptop.Terminal
+
+%clean
+rm -rf %{buildroot}
+
+%files -f org.laptop.Terminal.lang
+%defattr(-,root,root,-)
+%{_datadir}/sugar/activities/*
+%doc COPYING MAINTAINERS NEWS README
+
+%changelog
+
diff --git a/0.84/sucrose/sugar-turtleart/SPECS/sugar-turtleart.spec b/0.84/sucrose/sugar-turtleart/SPECS/sugar-turtleart.spec
index db2c37d..34aee94 100644
--- a/0.84/sucrose/sugar-turtleart/SPECS/sugar-turtleart.spec
+++ b/0.84/sucrose/sugar-turtleart/SPECS/sugar-turtleart.spec
@@ -1,85 +1,64 @@
+# NOTE: Do not edit, file was generated by jhconvert
+
 Name: sugar-turtleart
 Version: 41
-%if 0%{?suse_version}
-Release: 1
-%else
-Release: 1%{?dist}
-%endif
+Release: 2
+Summary: Pseudo-Logo graphical programming language for Sugar
+License: MIT
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
 
-Summary: Turtle Art activity for sugar
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/TurtleArt/TurtleArt-41.tar.bz2
 
-Group: Sugar/Activities
-License: MIT
-BuildArch: noarch
-URL: http://sugarlabs.org/go/Activities/TurtleArt
-Source0: http://download.sugarlabs.org/sources/sucrose/fructose/TurtleArt/TurtleArt-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python 
-BuildRequires: sugar-activities
-BuildRequires: sugar-toolkit
-Requires: sugar 
-Requires: sugar-activities
+Requires: python-numpy  
+Requires: python  
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: python-devel  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
-The Turtle Art activity is an Logo-inspired graphical "turtle" that 
-draws colorful  art based on Scratch-like snap-together visual 
-programming elements. 
+Turtle Art is an activity with a Logo-inspired graphical "turtle"
+that draws colorful art based on Scratch-like snap-together visual
+programming elements.
+There are many restrictions compared to LOGO. The two allowed user-defined
+procedures can't have parameters. Only two numeric global variables
+are available, no lists or other data-structures. You can't make user defined
+functions which return a value. The conditionals and some of the functions
+only take constants or variables, not expressions. Limited screen real-estate
+makes building large programs unfeasible.
 
 %prep
-%setup -q -n TurtleArt-%{version}
+%setup -q -n TurtleArt-41
 
 
 %build
-python ./setup.py build
+python  \
+	setup.py \
+	build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
-python ./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
-
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
 %find_lang org.laptop.TurtleArtActivity
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f org.laptop.TurtleArtActivity.lang
 %defattr(-,root,root,-)
-%doc
-%{sugaractivitydir}/TurtleArt.activity/
-%doc MANIFEST
+%{_datadir}/sugar/activities/*
 %doc NEWS
 
-
 %changelog
-* Tue Mar 03 2009 Bryan Kearney <bkearney@redhat.com> - 41-1
-- Additional Languages
-- Artwork cleanup
-
-* Tue Mar 03 2009 Bryan Kearney <bkearney@redhat.com> - 36-1
-- Bring in the latest from upstream
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 23-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Dec 15 2008 Bryan Kearney <bkearney@redhat.com> + 23-1
-- caching images
-- Russian support, minor fixes to FR and MN
-
-* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 19-2
-- Rebuild for Python 2.6
-
-* Sat Nov 29 2008 Marco Pesenti Gritti <mpg@redhat.com> - 19-1
-- Rebased to fix crash on startup with sugar 0.83
-
-* Mon Nov 24 2008 Bryan Kearney <bkearney@redhat.com> - 18-1
-- Rebased to use SVG instead of GIF
-- Finnish Language Support
-
-* Mon Nov 17 2008 Bryan Kearney <bkearney@redhat.com> - 16-1
-- New update from upstream.
-- Shebang patches
-- Mongolian Support
 
-* Thu Oct 22 2008 Bryan Kearney <bkearney@redhat.com> - 14-1
-- Initial packaging
diff --git a/0.84/sucrose/sugar-write/SPECS/sugar-write.spec b/0.84/sucrose/sugar-write/SPECS/sugar-write.spec
index fcd0f28..14ff25d 100644
--- a/0.84/sucrose/sugar-write/SPECS/sugar-write.spec
+++ b/0.84/sucrose/sugar-write/SPECS/sugar-write.spec
@@ -1,42 +1,55 @@
+# NOTE: Do not edit, file was generated by jhconvert
 
-Name:           sugar-write
-Summary:        Write activity for Sugar
-Version:        63 
-Release:        1 
-Group:          Sugar/Activities
-License:        GPLv2+
-Url:            http://wiki.laptop.org/go/Journal
-BuildArch:      noarch
-Source0:        Write-%{version}.tar.bz2
-BuildRequires:  python sugar-toolkit git-core gettext fdupes sugar-activities python-abiword
-Requires:       sugar python-abiword gconf2 
-AutoReq:	on
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%py_requires
-%define sugaractivitydir %_datadir/sugar/activities
+Name: sugar-write
+Version: 63
+Release: 2
+Summary: Word processor for Sugar
+License: GPLv2+
+Group: Sugar/Activities
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/fructose/Write/Write-63.tar.bz2
+
+Requires: abiword >= 2.6.8
+Requires: python-abiword  
+Requires: sugar-toolkit >= 0.84.4
+
+BuildRequires: gettext  
+BuildRequires: sugar-toolkit >= 0.84.4
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
-The Write activity for the XO desktop.
+The Write activity provides a word processor for the Sugar interface.
 
 %prep
-%setup -q -n Write-%{version}
+%setup -q -n Write-63
+
 
 %build
-python ./setup.py build
+python  \
+	setup.py \
+	build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{sugaractivitydir}
-./setup.py install --prefix=$RPM_BUILD_ROOT/%{_prefix}
+rm -rf %{buildroot}
+[ -f setup.py ] && chmod 0755 setup.py
+python  \
+	setup.py \
+	install \
+	--prefix=%{buildroot}/%{_prefix}
+%fdupes -s %{buildroot}
 %find_lang org.laptop.AbiWordActivity
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files -f org.laptop.AbiWordActivity.lang 
+%files -f org.laptop.AbiWordActivity.lang
 %defattr(-,root,root,-)
-%{sugaractivitydir}/Write.activity/
+%{_datadir}/sugar/activities/*
+%doc NEWS
 
 %changelog
 
diff --git a/deps/python-hulahop/SPECS/python-hulahop.spec b/deps/python-hulahop/SPECS/python-hulahop.spec
deleted file mode 100644
index d26e1cd..0000000
--- a/deps/python-hulahop/SPECS/python-hulahop.spec
+++ /dev/null
@@ -1,62 +0,0 @@
-%define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
-
-Summary: This package contains the Hulahop web rendering engine based on Gecko and PyXPCom 
-Name: python-hulahop 
-Version: 0.4.9 
-Release: 1
-URL: http://wiki.laptop.org/go/Sugar
-Source0: hulahop-%{version}.tar.bz2
-License: LGPLv2
-Group: System Environment/Libraries
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: pkgconfig
-BuildRequires: python-gtk-devel
-BuildRequires: gettext
-BuildRequires: gtk2-devel
-BuildRequires: perl-XML-Parser
-BuildRequires: xorg-x11-libSM-devel mozilla-xulrunner190-devel gcc-c++ python-xpcom190
-BuildRequires: -post-build-checks
-Requires: gnome-python-desktop
-Requires: dbus-1-python
-Requires: python-gtk
-Requires: python-xpcom 
-
-%description
-Sugar is the core of the OLPC Human Interface. The toolkit provides
-a set of widgets to build HIG compliant applications and interfaces
-to interact with system services like presence and the datastore.
-
-This package contains the Hulahop web rendering engine 
-based on Gecko and PyXPCom.
-
-%prep
-%setup -q -n hulahop-%{version}
-cat >> data/prefs.js << EOF
-pref("general.useragent.vendor", "OLPC");
-pref("general.useragent.vendorSub", "%{version}-%{release}");
-pref("general.useragent.vendorComment", "XO");
-EOF
-
-%build
-%configure --disable-static
-%__make
-
-%install
-make install DESTDIR=%{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files 
-%defattr(-,root,root,-)
-%doc COPYING
-%dir %{_libdir}/hulahop
-%{_libdir}/hulahop/*
-%dir %{py_sitedir}/hulahop
-%{py_sitedir}/hulahop/*
-%dir %{_datadir}/hulahop
-%{_datadir}/hulahop/*
-
-%changelog
-