[Dextrose] [PATCH dextrose3 4/4] use latest patch set tarball for sugar{, -toolkit}

[Sascha Silbe]

Signed-off-by: Sascha Silbe <silbe at activitycentral.com>
---
 rpms/sugar-toolkit/sugar-toolkit.spec |   16 ++++++++++++----
 rpms/sugar/sugar.spec                 |   13 ++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/rpms/sugar-toolkit/sugar-toolkit.spec b/rpms/sugar-toolkit/sugar-toolkit.spec
index db3091a..d0b2031 100644
--- a/rpms/sugar-toolkit/sugar-toolkit.spec
+++ b/rpms/sugar-toolkit/sugar-toolkit.spec
@@ -3,10 +3,11 @@
 Summary: Sugar toolkit
 Name: sugar-toolkit
 Version: 0.90.2
-Release: 2.dx3%{?dist}
-URL: http://wiki.laptop.org/go/Sugar
-Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.dx.tar.bz2
+Release: dx3.20110215%{?dist}
+URL: http://sugarlabs.org/
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
 Source1: macros.sugar
+Source2: http://people.sugarlabs.org/~silbe/dextrose/patchsets/%{name}-dx3-20110215.tar.gz
 License: LGPLv2+
 Group: System Environment/Libraries
 
@@ -18,6 +19,7 @@ BuildRequires: perl-XML-Parser
 BuildRequires: libSM-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: intltool
+BuildRequires: libtool
 
 Requires: gnome-python2-rsvg
 Requires: dbus-python
@@ -36,9 +38,12 @@ 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 -T -c -a 2 -n patches
+%setup -D -q
+for patch in ../patches/* ; do patch -p1 < "${patch}" ; done
 
 %build
+autoreconf -i
 %configure
 make %{?_smp_mflags} V=1
 
@@ -65,6 +70,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/rpm/macros.sugar
 
 %changelog
+* Tue Feb 15 2011 Sascha Silbe - 0.90.2-dx3.20110215
+- use latest patch set tarball
+
 * Fri Jan 21 2011 Steven M. Parrish <smparrish at gmail.com> - 0.90.2-2.dx
 - Apply Dextrose patchset
 
diff --git a/rpms/sugar/sugar.spec b/rpms/sugar/sugar.spec
index 0bda737..07c1a47 100644
--- a/rpms/sugar/sugar.spec
+++ b/rpms/sugar/sugar.spec
@@ -3,9 +3,10 @@
 Summary: Constructionist learning platform
 Name: sugar
 Version: 0.90.3
-Release: 2.dx3%{?dist}
+Release: dx3.20110215%{?dist}
 URL: http://sugarlabs.org/
-Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.dx.tar.bz2
+Source0: http://download.sugarlabs.org/sources/sucrose/glucose/%{name}/%{name}-%{version}.tar.bz2
+Source1: http://people.sugarlabs.org/~silbe/dextrose/patchsets/%{name}-dx3-20110215.tar.gz
 
 License: GPLv2+
 Group: User Interface/Desktops
@@ -64,9 +65,12 @@ The emulator let's you test and debug sugar. For example it allows you to run
 multiple instances of sugar.
 
 %prep
-%setup -q
+%setup -T -c -a 1 -n patches
+%setup -D -q
+for patch in ../patches/* ; do patch -p1 < "${patch}" ; done
 
 %build
+autoreconf -i
 %configure
 make
 
@@ -138,6 +142,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/scalable/apps/sugar-xo.svg
 
 %changelog
+* Tue Feb 15 2011 Sascha Silbe <sascha-pgp at silbe.org> - 0.90.3-dx3.20110215
+- use latest patch set tarball
+
 * Wed Jan 19 2011 Steven M. Parrish <smparrish at gmail.com> 0.90.3-2.dx3
 - apply Dextrose patch set
 
-- 
1.7.2.3