From 8fc47a728f7468ffe6ddff2248cf92ba88338b4e4f4393f4f9ce943d2d19ddcc Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 30 Jan 2012 11:27:04 +0000
Subject: [PATCH] Accepting request 101774 from KDE:Distro:Factory

forward to factory

OBS-URL: https://build.opensuse.org/request/show/101774
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=13
---
 marble-4.7.4.tar.bz2 |  3 ---
 marble-4.8.0.tar.bz2 |  3 +++
 marble.changes       | 16 ++++++++++++++++
 marble.spec          | 22 +++++++++++++---------
 4 files changed, 32 insertions(+), 12 deletions(-)
 delete mode 100644 marble-4.7.4.tar.bz2
 create mode 100644 marble-4.8.0.tar.bz2

diff --git a/marble-4.7.4.tar.bz2 b/marble-4.7.4.tar.bz2
deleted file mode 100644
index 6623be7..0000000
--- a/marble-4.7.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e6a735cceca8cb2df9bff7c79b7af35dca4c3f2a5f5d3cff2847e34acd95d40b
-size 21068089
diff --git a/marble-4.8.0.tar.bz2 b/marble-4.8.0.tar.bz2
new file mode 100644
index 0000000..5be8c53
--- /dev/null
+++ b/marble-4.8.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7312b7aba055be4f20d0cd02aad69cc648c1218d182cf81cc00ff35fa785712e
+size 21495914
diff --git a/marble.changes b/marble.changes
index 11ae855..1a38711 100644
--- a/marble.changes
+++ b/marble.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Jan 18 21:00:12 CET 2012 - dmueller@suse.de
+
+- update to 4.8.0
+  * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
+  * see http://kde.org/announcements/4.8/ for details
+  
+
+-------------------------------------------------------------------
+Tue Jan 10 18:47:16 CET 2012 - dmueller@suse.de
+
+- update to 4.7.98
+  * RC2+ milestone release of KDE 4.8
+  *  see http://kde.org/announcements/4.8/ for details
+  
+
 -------------------------------------------------------------------
 Fri Dec  2 02:01:35 CET 2011 - dmueller@suse.de
 
diff --git a/marble.spec b/marble.spec
index 41901aa..c59340e 100644
--- a/marble.spec
+++ b/marble.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package marble
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 Name:           marble
-Version:        4.7.4
+Version:        4.8.0
 Release:        0
 Summary:        Generic map viewer
 License:        LGPL-2.1+
@@ -30,7 +30,7 @@ BuildRequires:  libkdeedu4-devel
 BuildRequires:  perl
 Requires:       %{name}-data = %{version}
 Requires:       libkeduvocdocument4
-Requires:       libmarblewidget12 = %{version}
+Requires:       libmarblewidget13 = %{version}
 Suggests:       %{name}-doc = %{version}
 Suggests:       libkeduvocdocument4
 Provides:       kde4-marble = 4.3.0
@@ -91,21 +91,21 @@ BuildArch:      noarch
 %description doc
 Marble is a viewer of map data. This package contains its documentation.
 
-%package -n libmarblewidget12
+%package -n libmarblewidget13
 Summary:        Generic map viewer: Shared Library
 Group:          Development/Libraries/KDE
 Recommends:     %{name} = %{version}
 
-%description -n libmarblewidget12
+%description -n libmarblewidget13
 The shared library for the MarbleWidget shared library.
 
 %post   -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%post   -n libmarblewidget12 -p /sbin/ldconfig
+%post   -n libmarblewidget13 -p /sbin/ldconfig
 
-%postun -n libmarblewidget12 -p /sbin/ldconfig
+%postun -n libmarblewidget13 -p /sbin/ldconfig
 
 %files devel
 %defattr(-,root,root)
@@ -121,7 +121,7 @@ The shared library for the MarbleWidget shared library.
 %defattr(-,root,root)
 %{_kde4_htmldir}/en/marble/
 
-%files -n libmarblewidget12
+%files -n libmarblewidget13
 %defattr(-,root,root)
 %{_kde4_libdir}/libmarblewidget.so.*
 
@@ -130,14 +130,18 @@ The shared library for the MarbleWidget shared library.
 %exclude %{_kde4_appsdir}/marble/data
 %{_kde4_appsdir}/marble/
 %{_kde4_applicationsdir}/marble.desktop
-%{_kde4_bindir}/geodatatest
 %{_kde4_bindir}/marble
+%{_kde4_bindir}/marble-touch
 %{_kde4_bindir}/routing-instructions
 %{_kde4_bindir}/tilecreator
 %{_kde4_configkcfgdir}/marble.kcfg
 %{_kde4_iconsdir}/hicolor/*/apps/marble.*
 %{_kde4_modulesdir}/libmarble_part.so
 %{_kde4_modulesdir}/plasma_applet_worldclock.so
+%{_kde4_modulesdir}/plasma_runner_marble.so
+# fixme: we need to figure out a better way to handle common QML directories like this
+%dir %{_kde4_modulesdir}/imports/org/kde/edu/
+%{_kde4_modulesdir}/imports/org/kde/edu/marble/
 %{_kde4_modulesdir}/plugins/designer/*
 %{_kde4_modulesdir}/plugins/marble/
 %{_kde4_servicesdir}/*.desktop