[kdeedu] * Thu Apr 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.2-2 - update Marble to 1.1.0 (interim

[Kevin Kofler]

commit c9a48f46ebc5109422522e72d0424662bb617d0d
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Apr 22 01:07:54 2011 +0200

    * Thu Apr 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.2-2
    - update Marble to 1.1.0 (interim release between kdeedu 4.6.x and 4.7.x)

 .gitignore  |    1 +
 kdeedu.spec |   14 +++++++++++++-
 sources     |    1 +
 3 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9e7ad8c..7dcd5fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /kdeedu-4.6.1.tar.bz2
 /kdeedu-4.6.2.tar.bz2
+/marble-1.1.0-source.tar.gz
diff --git a/kdeedu.spec b/kdeedu.spec
index 42d9ede..7cc8f4c 100644
--- a/kdeedu.spec
+++ b/kdeedu.spec
@@ -8,12 +8,15 @@
 Name:    kdeedu
 Summary: Educational/Edutainment applications
 Version: 4.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Amusements/Games
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdeedu-%{version}.tar.bz2
+# interim Marble release (Marble 1.1.0)
+%global marblever 1.1.0
+Source1: http://files.kde.org/marble/downloads/sources/marble-%{marblever}-source.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
@@ -184,6 +187,12 @@ Group:   System Environment/Libraries
 
 %prep
 %setup -q -n kdeedu-%{version}%{?alphatag}
+# replace the Marble 1.0.x in kdeedu with 1.1.x
+%setup -q -T -a 1 -D -c -n marble-%{marblever}
+cd ..
+rm -rf marble doc/marble
+mv marble-%{marblever} marble
+mv marble/doc doc/marble
 
 
 %build
@@ -600,6 +609,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Apr 21 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.6.2-2
+- update Marble to 1.1.0 (interim release between kdeedu 4.6.x and 4.7.x)
+
 * Wed Apr 06 2011 Than Ngo <than at redhat.com> - 4.6.2-1
 - 4.6.2
 
diff --git a/sources b/sources
index 0c185b2..c80c6bd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 282a7fdd582718575e376e033ec8a049  kdeedu-4.6.2.tar.bz2
+4d79beff5d5fb6307431fd471132f0a7  marble-1.1.0-source.tar.gz