From 40ea9bb68ab67d7f657b6b9c2ec4794b1e62c627 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <erikos@fedoraproject.org>
Date: Jan 04 2009 21:23:27 +0000
Subject: - New download url

- Fix language parsing on Gentoo and ALTLinux #81 (alsroot)
- Change the FRAME_POSITION_RELATIVE to follow eben's spec
- exec sugar-session
- Add wired device icon for the frame
- Only show wireless device in the frame when connecting/connected
- Use jabber.sugarlabs.org by default
- Only create a keydialog for the activating connection
- CanvasPulsingIcon: Don't begin pulse loop on resume if not pulsing
- Use g_timeout_add_seconds() for power efficiency
- Add the journal button to the volumes toolbar in the journal
- Remove jarabe/model/volume.py and use gio instead
- First try at restoring removable devices support in the journal
- make the image viewer activity the default one for iamges

---

diff --git a/.cvsignore b/.cvsignore
index 9934db4..e509b53 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sugar-0.83.2.tar.bz2
+sugar-0.83.4.tar.bz2
diff --git a/desktop.patch b/desktop.patch
deleted file mode 100644
index e0d5b9f..0000000
--- a/desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- data/sugar.desktop.orig	2008-11-28 11:42:08.000000000 +0100
-+++ data/sugar.desktop	2008-11-28 11:42:21.000000000 +0100
-@@ -2,5 +2,5 @@
- Encoding=UTF-8
- Name=Sugar
- GenericName=Sugar
--Exec=sugar-shell
-+Exec=sugar
- Type=Application
diff --git a/sources b/sources
index 01a0f54..befb062 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96ffdd4392bce3d4958a5ea871cb1f64  sugar-0.83.3.tar.bz2
+6b981c63bb5d8b23b43831ece79884e6  sugar-0.83.4.tar.bz2
diff --git a/sugar.spec b/sugar.spec
index e3704f8..8376602 100644
--- a/sugar.spec
+++ b/sugar.spec
@@ -5,16 +5,14 @@
 
 Summary: Constructionist learning platform
 Name: sugar
-Version: 0.83.3
-Release: 6%{?dist}
+Version: 0.83.4
+Release: 1%{?dist}
 URL: http://sugarlabs.org/
-Source0: http://dev.laptop.org/pub/sugar/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 License: GPLv2+
 Group: User Interface/Desktops
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: desktop.patch
-
 BuildRequires: pkgconfig
 BuildRequires: perl-XML-Parser
 BuildRequires: gettext
@@ -37,7 +35,7 @@ Requires: openssh
 
 %description
 
-Sugar provides a simple yet powerful means of engaging young
+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
@@ -64,8 +62,6 @@ multiple instances of sugar.
 %prep
 %setup -q
 
-%patch1 -p0 -b .desktop
-
 %build
 %configure
 make
@@ -134,6 +130,22 @@ rm -rf %{buildroot}
 %{_bindir}/sugar-emulator
 
 %changelog
+* Sun Jan 04 2009 Simon Schampijer <simon@laptop.org> - 0.83.4-1
+- New download url
+- Fix language parsing on Gentoo and ALTLinux #81 (alsroot)
+- Change the FRAME_POSITION_RELATIVE to follow eben's spec
+- exec sugar-session
+- Add wired device icon for the frame
+- Only show wireless device in the frame when connecting/connected
+- Use jabber.sugarlabs.org by default
+- Only create a keydialog for the activating connection
+- CanvasPulsingIcon: Don't begin pulse loop on resume if not pulsing
+- Use g_timeout_add_seconds() for power efficiency
+- Add the journal button to the volumes toolbar in the journal
+- Remove jarabe/model/volume.py and use gio instead
+- First try at restoring removable devices support in the journal
+- make the image viewer activity the default one for iamges
+
 * Wed Dec 21 2008 Bernie Innocenti <bernie@codewiz.org> - 0.83.3-6
 - Add missing dependencies on xorg-x11-utils, dbus-x11 and openssh