Glucose generated by jhconvert

7 files changed, 321 insertions, 284 deletions

diff --git a/0.84/sugar-artwork/SPECS/sugar-artwork.spec b/0.84/sugar-artwork/SPECS/sugar-artwork.spec
index 61a7872..aeb7d73 100644
--- a/0.84/sugar-artwork/SPECS/sugar-artwork.spec
+++ b/0.84/sugar-artwork/SPECS/sugar-artwork.spec
@@ -1,37 +1,52 @@
-Name:          sugar-artwork
-Summary:       Artwork for Sugar look-and-feel
-Version:       0.84.0 
-Release:       2.2
-Url:           http://dev.laptop.org
-Group:         User Interface/Desktops
-License:       GPL
-Source0:       http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 
-BuildRequires: gtk2-devel >= 2.9.0 icon-naming-utils
-BuildRequires: xorg-x11
-BuildRequires: perl-XML-Parser
-BuildRequires: python icon-slicer
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-artwork
+Version: 0.84.1
+Release: 1
+Summary: Artwork for Sugar look-and-feel
+License: LGPLv2+
+Group: User Interface/Desktops
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/sugar-artwork-0.84.1.tar.bz2
+
+Requires: gtk2 >= 2.9.0
+Requires: sugar-base >= 0.84.1
+
+BuildRequires: perl-XML-Parser  
+BuildRequires: gtk2-devel >= 2.9.0
+BuildRequires: icon-naming-utils  
+BuildRequires: icon-slicer  
+BuildRequires: python  
+BuildRequires: xorg-x11  
 BuildRequires: fdupes
-Requires:      gtk2 >= 2.9.0 sugar
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-sugar-artwork contains the themes and icons that make up the OLPC default 
-look and feel.
+Contains the themes and icons that make up the Sugar default look and feel.
 
 %prep
-%setup -q
+%setup -q -n sugar-artwork-0.84.1
+
+
+# eliminate %%configure's "clever" behaviour
+%define __libtoolize true
 
 %build
-%configure
-%__make 
+%configure 
+make 
 
 %install
-%makeinstall
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/engines/*.la
-%fdupes -s %buildroot
+rm -rf %{buildroot}
+make  \
+	DESTDIR=%{buildroot} \
+	install
+%fdupes -s %{buildroot}
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/sugar || :
@@ -41,15 +56,16 @@ touch --no-create %{_datadir}/icons/sugar || :
 touch --no-create %{_datadir}/icons/sugar || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/sugar || :
 
-%files
-%defattr(-,root,root)
-%doc README COPYING
-%{_datadir}/icons/sugar
-%{_datadir}/themes/sugar
-%{_datadir}/themes/sugar-*
-%{_libdir}/gtk-2.0/*/engines/*.so
+%files 
+%defattr(-,root,root,-)
+%_datadir/icons/*
+%_datadir/themes/*
+%_libdir/gtk*/*/engines/*
+%doc COPYING NEWS README
 
 %changelog
+* Thu Apr 23 2009 alsroot@member.fsf.org
+- Switch to jhconvert
 * Sat Mar  7 2009 lars@linux-schulserver.de
 - use fdupes
 * Fri Mar  6 2009 cyberorg@opensuse.org
diff --git a/0.84/sugar-base/SPECS/sugar-base.spec b/0.84/sugar-base/SPECS/sugar-base.spec
index fd8dbb8..d9dabd4 100644
--- a/0.84/sugar-base/SPECS/sugar-base.spec
+++ b/0.84/sugar-base/SPECS/sugar-base.spec
@@ -1,74 +1,66 @@
+# NOTE: Do not edit, file was generated by jhconvert
 
-Name:          sugar-base
-Summary:       Base Sugar library
-Version:       0.84.0
-Release:       5.1
-Url:           http://dev.laptop.org/
-Source0:       http://dev.laptop.org/pub/sugar/sources/sugar-base/%{name}-%{version}.tar.bz2
-License:       LGPLv2
-Group:         System Environment/Libraries
-BuildRequires: python-devel
-BuildRequires: python-gobject2-devel
-BuildRequires: python-gtk-devel 
-BuildRequires: gettext intltool
-BuildRequires: perl-XML-Parser
+Name: sugar-base
+Version: 0.84.1
+Release: 1
+Summary: Base Sugar library
+License: LGPLv2
+Group: System Environment/Libraries
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/sugar-base-0.84.1.tar.bz2
+
+Requires: dbus-1-python  
+Requires: python-gnome  
+Requires: python-gobject2 >= 2.15
+Requires: python-gtk  
+Requires: python  
+
+BuildRequires: perl-XML-Parser  
+BuildRequires: gettext  
+BuildRequires: intltool >= 0.33
+BuildRequires: pkgconfig  
+BuildRequires: python-gobject2-devel >= 2.15
+BuildRequires: python-gtk-devel  
+BuildRequires: python-devel  
 BuildRequires: fdupes
-Requires:      sugar
-Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define        python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-The base libary for Sugar, the user interface of the One Laptop Per
-Child project. It provides helpers for the development of services and
-activities.
+The base libary for Sugar. It provides helpers for the development
+of services and activities.
 
 %prep
-%setup -q
+%setup -q -n sugar-base-0.84.1
+
+
+# eliminate %%configure's "clever" behaviour
+%define __libtoolize true
 
 %build
-%configure
-make %{?jobs:-j%jobs}
+%configure 
+make 
 
 %install
-%makeinstall
-%find_lang %name
-%fdupes -s %buildroot
+rm -rf %{buildroot}
+make  \
+	DESTDIR=%{buildroot} \
+	install
+%fdupes -s %{buildroot}
+%find_lang sugar-base
 
 %clean
 rm -rf %{buildroot}
 
-%files -f %{name}.lang
+%files -f sugar-base.lang
 %defattr(-,root,root,-)
-%dir /usr/share/locale/ay
-%dir /usr/share/locale/ay/LC_MESSAGES
-%dir /usr/share/locale/fa_AF
-%dir /usr/share/locale/fa_AF/LC_MESSAGES
-%dir /usr/share/locale/ff
-%dir /usr/share/locale/ff/LC_MESSAGES
-%dir /usr/share/locale/ht
-%dir /usr/share/locale/ht/LC_MESSAGES
-%dir /usr/share/locale/mvo
-%dir /usr/share/locale/mvo/LC_MESSAGES
-%dir /usr/share/locale/pap
-%dir /usr/share/locale/pap/LC_MESSAGES
-%dir /usr/share/locale/pis
-%dir /usr/share/locale/pis/LC_MESSAGES
-%dir /usr/share/locale/qu
-%dir /usr/share/locale/qu/LC_MESSAGES
-%dir /usr/share/locale/sd
-%dir /usr/share/locale/sd/LC_MESSAGES
-%dir /usr/share/locale/tpi
-%dir /usr/share/locale/tpi/LC_MESSAGES
-%if %suse_version <= 1110
-%dir /usr/share/locale/ha
-%dir /usr/share/locale/ha/LC_MESSAGES
-%dir /usr/share/locale/ig
-%dir /usr/share/locale/ig/LC_MESSAGES
-%endif
-
-%{python_sitelib}/*
+%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
+%doc COPYING NEWS
 
 %changelog
+* Thu Apr 23 2009 alsroot@member.fsf.org
+- Switch to jhconvert
 * Fri Mar  6 2009 cyberorg@opensuse.org
 - Update to 0.84.0
 * Fri Jan 16 2009 cyberorg@opensuse.org
diff --git a/0.84/sugar-datastore/SPECS/sugar-datastore.spec b/0.84/sugar-datastore/SPECS/sugar-datastore.spec
index 85845c7..44b29da 100644
--- a/0.84/sugar-datastore/SPECS/sugar-datastore.spec
+++ b/0.84/sugar-datastore/SPECS/sugar-datastore.spec
@@ -1,53 +1,64 @@
+# NOTE: Do not edit, file was generated by jhconvert
 
-Name:          sugar-datastore
-Summary:       Sugar Datastore
-Version:       0.84.0 
-Release:       2.2
-Group:         Development/Libraries
-License:       GPL
-Url:           http://dev.laptop.org/
-Source0:       http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
-BuildRequires: python python-devel
+Name: sugar-datastore
+Version: 0.84.0
+Release: 1
+Summary: Datastore service for Sugar
+License: GPL
+Group: Development/Libraries
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/sugar-datastore-0.84.0.tar.bz2
+
+Requires: dbus-1-python  
+Requires: python  
+Requires: python-cjson  
+Requires: sugar-base >= 0.84.1
+Requires: python-xapian  
+
+BuildRequires: python-devel  
 BuildRequires: fdupes
-Requires:      python-gnome 
-Requires:      python-xapian
-Requires:      python-sqlite2
-Requires:      python-cjson
-Requires:      sugar
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define        python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Sugar Datastore is a simple log like datastore able to connect with multiple
-backends. The datastore supports connectionig and disconnecting from
-backends on the fly to help the support the limit space/memory
-characteristics of the OLPC system and the fact that network services
-may become unavailable at times
+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.
 
 %prep
-%setup -q
+%setup -q -n sugar-datastore-0.84.0
+
+
+# eliminate %%configure's "clever" behaviour
+%define __libtoolize true
 
 %build
-%configure
-make %{?jobs:-j%jobs}
+%configure 
+make 
 
 %install
-%makeinstall
-%fdupes -s %buildroot
+rm -rf %{buildroot}
+make  \
+	DESTDIR=%{buildroot} \
+	install
+%fdupes -s %{buildroot}
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files 
 %defattr(-,root,root,-)
-%doc LICENSE.GPL README.txt
-%{python_sitelib}/*
 %{_bindir}/*
-%dir %{_datadir}/dbus-1
-%dir %{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/services/*.service
+%{_datadir}/dbus*/services/*
+%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
+%doc LICENSE.GPL README.txt
 
 %changelog
+* Thu Apr 23 2009 alsroot@member.fsf.org
+- Switch to jhconvert
 * Sat Mar  7 2009 lars@linux-schulserver.de
 - use fdupes
 * Fri Mar  6 2009 cyberorg@opensuse.org
diff --git a/0.84/sugar-presence-service/SPECS/sugar-presence-service.spec b/0.84/sugar-presence-service/SPECS/sugar-presence-service.spec
index fcdbb57..55609da 100644
--- a/0.84/sugar-presence-service/SPECS/sugar-presence-service.spec
+++ b/0.84/sugar-presence-service/SPECS/sugar-presence-service.spec
@@ -1,48 +1,61 @@
-Name:          sugar-presence-service
-Summary:       Sugar presence service
-Version:       0.84.0
-Release:       2.2
-Group:         System Environment/Libraries
-License:       GPLv2+
-Url:           http://dev.laptop.org/
-Source0:       http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2 
-BuildArch:     noarch
-BuildRequires: python fdupes
-Requires:      python-telepathy >= 0.14.0
-Requires:      dbus-1-python 
-Requires:      telepathy-gabble
-Requires:      telepathy-salut
-Requires:      sugar
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# NOTE: Do not edit, file was generated by jhconvert
+
+Name: sugar-presence-service
+Version: 0.84.0
+Release: 1
+Summary: The Sugar presence service
+License: GPLv2+
+Group: System Environment/Libraries
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/sugar-presence-service-0.84.0.tar.bz2
+
+Requires: avahi  
+Requires: gnutls >= 2.4
+Requires: python  
+Requires: sugar-base >= 0.84.1
+Requires: telepathy-gabble >= 0.7.21
+Requires: python-telepathy >= 0.15.7
+Requires: telepathy-salut >= 0.3.8
+
+BuildRequires: python-devel  
+BuildRequires: fdupes
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The Sugar presence service.
 
 %prep
-%setup -q
+%setup -q -n sugar-presence-service-0.84.0
+
 
 %build
-%configure --disable-static
-%__make %{?jobs:-j%jobs}
+%configure 
+make 
 
 %install
-%makeinstall 
-%fdupes $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make  \
+	DESTDIR=%{buildroot} \
+	install
+%fdupes -s %{buildroot}
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files 
 %defattr(-,root,root,-)
-%doc COPYING
-%{_bindir}/sugar-presence-service
-%dir %{_datadir}/dbus-1
-%dir %{_datadir}/dbus-1/services
 %{_datadir}/sugar-presence-service
+%{_datadir}/dbus*/services/*
+%{_bindir}/*
+%doc COPYING NEWS
 %attr(755,root,root) %{_datadir}/sugar-presence-service/main.py
-%{_datadir}/dbus-1/services/org.laptop.Sugar.Presence.service
 
 %changelog
+* Thu Apr 23 2009 alsroot@member.fsf.org
+- Switch to jhconvert
 * Fri Jan 16 2009 cyberorg@opensuse.org
 - Update to 0.83.2
 * Tue Aug 26 2008 cyberorg@opensuse.org
diff --git a/0.84/sugar-toolkit/SPECS/sugar-toolkit.spec b/0.84/sugar-toolkit/SPECS/sugar-toolkit.spec
index 2e6fa83..55ccc1c 100644
--- a/0.84/sugar-toolkit/SPECS/sugar-toolkit.spec
+++ b/0.84/sugar-toolkit/SPECS/sugar-toolkit.spec
@@ -1,86 +1,74 @@
+# NOTE: Do not edit, file was generated by jhconvert
 
-Name:          sugar-toolkit
-Summary:       Sugar toolkit
-Version:       0.84.0 
-Release:       7.1
-Url:           http://wiki.laptop.org/go/Sugar
-Source0:       http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
-Source1:       macros.sugar
-License:       LGPLv2
-Group:         System Environment/Libraries
-BuildRequires: pkgconfig
-BuildRequires: python-gtk-devel
-BuildRequires: gettext intltool
-BuildRequires: gtk2-devel
-BuildRequires: perl-XML-Parser
-BuildRequires: xorg-x11-libSM-devel alsa-devel
+Name: sugar-toolkit
+Version: 0.84.4
+Release: 1
+Summary: Sugar toolkit
+License: LGPLv2
+Group: System Environment/Libraries
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-0.84.4.tar.bz2
+
+Requires: sugar-datastore >= 0.84.0
+Requires: dbus-1-python  
+Requires: python-hippo-canvas >= 0.3.0
+Requires: gnome-python-desktop  
+Requires: sugar-presence-service >= 0.84.0
+Requires: python-gobject2 >= 2.14
+Requires: python  
+Requires: python-cjson  
+Requires: sugar-base >= 0.84.1
+
+BuildRequires: perl-XML-Parser  
+BuildRequires: alsa-devel  
+BuildRequires: gettext  
+BuildRequires: gtk2-devel  
+BuildRequires: intltool >= 0.33
+BuildRequires: xorg-x11-libSM-devel  
+BuildRequires: python-gobject2-devel >= 2.14
+BuildRequires: python-gtk-devel  
+BuildRequires: python-devel  
+BuildRequires: xorg-x11-proto-devel  
 BuildRequires: fdupes
-Requires:      gnome-python-desktop
-Requires:      dbus-1-python
-Requires:      python-gtk
-Requires:      libhippocanvas-1-0-python 
-Requires:      sugar-datastore
-Requires:      sugar-base
-Requires:      sugar-presence-service
-Requires:      python-simplejson
-Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%define        python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %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.
+The toolkit provides a set of widgets to build HIG compliant applications
+and interfaces to interact with system services like presence
+and the datastore.
 
 %prep
-%setup -q
+%setup -q -n sugar-toolkit-0.84.4
+
+
+# eliminate %%configure's "clever" behaviour
+%define __libtoolize true
 
 %build
 %configure 
-make %{?jobs:-j%jobs}
+make 
 
 %install
-%makeinstall
-%find_lang %name
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
-install -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.sugar
-%fdupes -s %buildroot
+rm -rf %{buildroot}
+make  \
+	DESTDIR=%{buildroot} \
+	install
+%fdupes -s %{buildroot}
+%find_lang sugar-toolkit
 
 %clean
 rm -rf %{buildroot}
 
-%files -f %{name}.lang
+%files -f sugar-toolkit.lang
 %defattr(-,root,root,-)
-%doc COPYING README
-%dir /usr/share/locale/ay/LC_MESSAGES
-%dir /usr/share/locale/fa_AF/LC_MESSAGES
-%dir /usr/share/locale/ff/LC_MESSAGES
-%dir /usr/share/locale/ht/LC_MESSAGES
-%dir /usr/share/locale/mvo/LC_MESSAGES
-%dir /usr/share/locale/pap/LC_MESSAGES
-%dir /usr/share/locale/pis/LC_MESSAGES
-%dir /usr/share/locale/qu/LC_MESSAGES
-%dir /usr/share/locale/sd/LC_MESSAGES
-%dir /usr/share/locale/tpi/LC_MESSAGES
-%dir /usr/share/locale/ay
-%dir /usr/share/locale/fa_AF
-%dir /usr/share/locale/ff
-%dir /usr/share/locale/ht
-%dir /usr/share/locale/mvo
-%dir /usr/share/locale/pap
-%dir /usr/share/locale/pis
-%dir /usr/share/locale/qu
-%dir /usr/share/locale/sd
-%dir /usr/share/locale/tpi
-%if %suse_version <= 1110
-%dir /usr/share/locale/ha
-%dir /usr/share/locale/ha/LC_MESSAGES
-%dir /usr/share/locale/ig
-%dir /usr/share/locale/ig/LC_MESSAGES
-%endif
-%{python_sitelib}/*
-%config %{_sysconfdir}/rpm/macros.sugar
+%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
+%doc AUTHORS COPYING README
 
 %changelog
+* Thu Apr 23 2009 alsroot@member.fsf.org
+- Switch to jhconvert
 * Sat Mar  7 2009 lars@linux-schulserver.de
 - use fdupes
 * Fri Mar  6 2009 cyberorg@opensuse.org
diff --git a/0.84/sugar/SOURCES/sugar-0.84.5-sugar-start-script.patch b/0.84/sugar/SOURCES/sugar-0.84.5-sugar-start-script.patch
new file mode 100644
index 0000000..125de79
--- /dev/null
+++ b/0.84/sugar/SOURCES/sugar-0.84.5-sugar-start-script.patch
@@ -0,0 +1,13 @@
+--- sugar/bin/sugar.in.orig	2009-01-20 03:00:01.000000000 +0000
++++ sugar/bin/sugar.in	2009-01-20 16:18:14.000000000 +0000
+@@ -1,7 +1,9 @@
+ #!/bin/sh
+ 
++echo Xcursor.theme: sugar | xrdb
++
+ if test -z "$SUGAR_SCALING"; then
+-    export SUGAR_SCALING=100
++    export SUGAR_SCALING=72
+ fi
+ 
+ export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc"
diff --git a/0.84/sugar/SPECS/sugar.spec b/0.84/sugar/SPECS/sugar.spec
index 7134be7..3f8864f 100644
--- a/0.84/sugar/SPECS/sugar.spec
+++ b/0.84/sugar/SPECS/sugar.spec
@@ -1,54 +1,77 @@
-Name:          sugar
-Summary:       OLPC desktop environment
-Version:       0.84.0
-Release:       5.4
-Url:           http://dev.laptop.org
-Source0:       http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0:	       sugar-desktop.diff
-#Patch1: sugar-logout-option.patch	
-License:       GPL/LGPL
-Group:         System Environment/Libraries
-BuildRequires: pkgconfig dbus-1
-BuildRequires: perl-XML-Parser
-BuildRequires: gettext intltool
-BuildRequires: python
-BuildRequires: python-gtk-devel 
-BuildRequires: gtk2-devel gconf2-devel
+# NOTE: Do not edit, file was generated by jhconvert
 
+Name: sugar
+Version: 0.84.5
+Release: 1
+Summary: Sugar window manager
+License: GPL/LGPL
+Group: System Environment/Libraries
+Url: http://sugarlabs.org/
+
+Source: http://download.sugarlabs.org/sources/sucrose/glucose/sugar/sugar-0.84.5.tar.bz2
+
+Patch: sugar-0.84.5-sugar-start-script.patch
+
+Requires: sugar-artwork >= 0.84.1
+Requires: dbus-1  
+Requires: dbus-1-x11  
+Requires: gconf2  
+Requires: gstreamer-0_10-plugins-base  
+Requires: python-gstreamer-0_10  
+Requires: gtk2  
+Requires: hal  
+Requires: gnome-python-desktop  
+Requires: matchbox-window-manager  
+Requires: python-numpy  
+Requires: openssh  
+Requires: python-gtk  
+Requires: python-gtksourceview  
+Requires: python  
+Requires: python-cjson  
+Requires: sugar-toolkit >= 0.84.4
+Requires: xorg-x11  
+
+BuildRequires: perl-XML-Parser  
+BuildRequires: gconf2-devel  
+BuildRequires: gettext  
+BuildRequires: gtk2-devel  
+BuildRequires: intltool >= 0.33
+BuildRequires: python-gtk-devel  
+BuildRequires: python-devel  
 BuildRequires: fdupes
-AutoReqProv:   on
-Requires:      sugar-artwork
-Requires:      sugar-toolkit
-Requires:      sugar-base
-Requires:      sugar-datastore
-Requires:      sugar-presence-service
-Requires:      gnome-python-desktop dbus-1
-Requires:      python-gstreamer-0_10 xorg-x11-libXt python-gtk python-gtksourceview
-Requires:      gtk2 poppler pango cairo libavahi-gobject0 
-Requires:      gstreamer-0_10-plugins-base python-telepathy libhippocanvas-1-0-python 
-Requires:      matchbox-window-manager fribidi sqlite2 expat dejavu avahi-utils libglade2
-Requires:      python-numpy python-json python-cairo python-simplejson popt libcroco librsvg2 xorg-x11-server-extra
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-Desktop Environment for the One Laptop Per Child project; see the
- http://www.laptop.org for goals of this project.
+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.
+
+%package emulator
+Summary: The emulator for the Sugar Desktop Environment
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: x11-server-xephyr
+%description emulator
+This package contains the Sugar emulator. It is using Xephyr
+to run a Sugar environment similar to what is on the XO laptop. 
 
 %prep
-%setup -q
-#%patch0 -p1
-#%patch1 -p1
+%setup -q -n sugar-0.84.5
+%patch -p1
 
 %build
-%configure
-%__make %{?jobs:-j%jobs}
+%configure 
+make 
 
 %install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=%{buildroot}
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%fdupes -s %buildroot
-%find_lang %name
+rm -rf %{buildroot}
+make  \
+	DESTDIR=%{buildroot} \
+	install
+%fdupes -s %{buildroot}
+%find_lang sugar
 
 %post
 if (update-mime-database -v &> /dev/null); then
@@ -73,45 +96,26 @@ fi
 %clean
 rm -rf %{buildroot}
 
-%files -f %{name}.lang
+%files -f sugar.lang
 %defattr(-,root,root,-)
-%doc COPYING README
-%dir %{py_sitedir}/jarabe
 %dir %{_datadir}/sugar
-#%config %{_sysconfdir}/dbus-1/system.d/NetworkManagerInfo.conf
-%config %{_sysconfdir}/dbus-1/system.d/nm-user-settings.conf
-%config %{_sysconfdir}/gconf/schemas/sugar.schemas
+%config(noreplace) %{_sysconfdir}/dbus*/system.d/*
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*
+%{_bindir}/*
+%exclude %{_bindir}/sugar-emulator
+%(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")/*
 %{_datadir}/sugar/*
+%{_datadir}/mime/packages/*
 %{_datadir}/xsessions/sugar.desktop
-%{_bindir}/*
-%{py_sitedir}/jarabe/*
-%{_datadir}/mime/packages/sugar.xml
-%dir /usr/share/locale/ay
-%dir /usr/share/locale/ay/LC_MESSAGES
-%dir /usr/share/locale/fa_AF
-%dir /usr/share/locale/fa_AF/LC_MESSAGES
-%dir /usr/share/locale/ff
-%dir /usr/share/locale/ff/LC_MESSAGES
-%dir /usr/share/locale/ha
-%dir /usr/share/locale/ha/LC_MESSAGES
-%dir /usr/share/locale/ht
-%dir /usr/share/locale/ht/LC_MESSAGES
-%dir /usr/share/locale/ig
-%dir /usr/share/locale/ig/LC_MESSAGES
-%dir /usr/share/locale/mvo
-%dir /usr/share/locale/mvo/LC_MESSAGES
-%dir /usr/share/locale/pap
-%dir /usr/share/locale/pap/LC_MESSAGES
-%dir /usr/share/locale/pis
-%dir /usr/share/locale/pis/LC_MESSAGES
-%dir /usr/share/locale/qu
-%dir /usr/share/locale/qu/LC_MESSAGES
-%dir /usr/share/locale/sd
-%dir /usr/share/locale/sd/LC_MESSAGES
-%dir /usr/share/locale/tpi
-%dir /usr/share/locale/tpi/LC_MESSAGES
+%doc AUTHORS COPYING README
+
+%files emulator
+%defattr(-,root,root,-)
+%{_bindir}/sugar-emulator
 
 %changelog
+* Thu Apr 23 2009 alsroot@member.fsf.org
+- Switch to jhconvert
 * Sat Mar  7 2009 lars@linux-schulserver.de
 - use fdupes
 * Fri Mar  6 2009 cyberorg@opensuse.org