[marble] 4.9.90 (4.10 beta2)

[Rex Dieter]

commit 8c9f9cd87be2c9b965a4639e659c00ef22cdfcef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 3 19:29:28 2012 -0600

    4.9.90 (4.10 beta2)

 .gitignore              |    4 +--
 marble-4.8.80-opt.patch |   71 -----------------------------------------------
 marble.spec             |   27 +++++++++++++----
 sources                 |    2 +-
 4 files changed, 22 insertions(+), 82 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d08c8c..9a905f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 /marble-4.8.5.tar.xz
-/marble-4.9.1.tar.xz
-/marble-4.9.2.tar.xz
-/marble-4.9.3.tar.xz
 /marble-4.9.4.tar.xz
+/marble-4.9.90.tar.xz
diff --git a/marble.spec b/marble.spec
index 6d9cb34..ac137b0 100644
--- a/marble.spec
+++ b/marble.spec
@@ -4,11 +4,11 @@
 Name:    marble
 Summary: Virtual globe and world atlas 
 Epoch:   1
-Version: 4.9.4
+Version: 4.9.90
 Release: 1%{?dist}
 
 License: LGPLv2+
-#URL:     https://projects.kde.org/projects/kde/kdeedu/marble
+#URL:    https://projects.kde.org/projects/kde/kdeedu/marble
 URL:     http://edu.kde.org/marble/
 %global revision %(echo %{version} | cut -d. -f3)
 %if %{revision} >= 50
@@ -16,11 +16,9 @@ URL:     http://edu.kde.org/marble/
 %else
 %global stable stable
 %endif
-Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+Source0:  http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
 
 ## upstreamable patches
-# drop hardcoded (-O3) optimizations
-Patch50: marble-4.8.80-opt.patch
 
 ## upstream patches
 
@@ -42,6 +40,9 @@ Obsoletes: kdeedu-marble < 4.7.0-10
 Provides:  kdeedu-marble = %{version}-%{release}
 Provides:  kdeedu-marble%{?_isa} = %{version}-%{release}
 
+Provides: marble-part = %{version}-%{release}
+Provides: marble-part%{?_isa} = %{version}-%{release}
+
 %if ! 0%{?marble}
 Obsoletes: python-marble < %{epoch}:%{version}-%{release}
 %endif
@@ -92,8 +93,6 @@ Requires: pykde4 >= %{version}
 %prep
 %setup -q
 
-%patch50 -p1 -b .opt
-
 
 %build
 mkdir -p %{_target_platform}
@@ -123,11 +122,13 @@ touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-mime-database %{_kde4_datadir}/mime >& /dev/null
 
 %postun
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-mime-database %{_kde4_datadir}/mime >& /dev/null
 fi
 
 %files -f %{name}.lang
@@ -139,8 +140,16 @@ fi
 %{_kde4_bindir}/routing-instructions
 %{_kde4_bindir}/tilecreator
 %{_kde4_datadir}/applications/kde4/marble.desktop
+%{_kde4_datadir}/applications/kde4/marble_gpx.desktop
+%{_kde4_datadir}/applications/kde4/marble_kml.desktop
+%{_kde4_datadir}/applications/kde4/marble_osm.desktop
+%{_kde4_datadir}/applications/kde4/marble_shp.desktop
 %{_kde4_datadir}/config.kcfg/marble.kcfg
 %{_kde4_datadir}/kde4/services/marble_part.desktop
+%{_kde4_datadir}/kde4/services/marble_part_gpx.desktop
+%{_kde4_datadir}/kde4/services/marble_part_kml.desktop
+%{_kde4_datadir}/kde4/services/marble_part_osm.desktop
+%{_kde4_datadir}/kde4/services/marble_part_shp.desktop
 %{_kde4_libdir}/kde4/libmarble_part.so
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 # worldclock links against libmarblewidget, include here
@@ -149,6 +158,7 @@ fi
 %{_kde4_libdir}/kde4/plasma_runner_marble.so
 %{_kde4_datadir}/kde4/services/plasma-runner-marble.desktop
 %{_qt4_importdir}/org/
+%{_kde4_datadir}/mime/packages/geo.xml
 
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
@@ -171,6 +181,9 @@ fi
 
 
 %changelog
+* Mon Dec 03 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-1
+- 4.9.90 (4.10 beta2)
+
 * Mon Dec 03 2012 Than Ngo <than at redhat.com> - 4.9.4-1
 - 4.9.4
 
diff --git a/sources b/sources
index 1a5ef56..3497c3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dd1fbd04e860530b22936cc2ae3e37b  marble-4.9.4.tar.xz
+4ea3f668ee78b2561aa99f328624ed40  marble-4.9.90.tar.xz