From 680bb5a92a819a2c0d6d913c0193c1a18f50f4310b0f384e9a4f7b5b80b7fc02 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Fri, 11 Aug 2017 23:01:21 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=145

---
 marble.changes |  9 +++++++++
 marble.spec    | 33 +++++++++++++++++----------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/marble.changes b/marble.changes
index f65bc2b..329ec26 100644
--- a/marble.changes
+++ b/marble.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Aug 11 22:46:26 UTC 2017 - christophe@krop.fr
+
+- Update to KDE Applications 17.08.0
+  * New feature release
+  * https://www.kde.org/announcements/announce-applications-17.08.0.php
+- Changes since 17.04.3 :
+- Too many changes to list here
+
 -------------------------------------------------------------------
 Sat Aug  5 18:19:34 UTC 2017 - christophe@krop.fr
 
diff --git a/marble.spec b/marble.spec
index 8192d1f..822cf2c 100644
--- a/marble.spec
+++ b/marble.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package marble
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %bcond_without lang
 
 %define _so -28
@@ -23,7 +24,7 @@ Name:           marble
 Version:        17.07.90
 Release:        0
 %define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
 %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 Summary:        Generic map viewer
 # License note: the tools directory contains GPL-3 tools, but they are neither built nor installed by the package
@@ -31,8 +32,6 @@ License:        LGPL-2.1+
 Group:          Amusements/Teaching/Other
 Url:            http://edu.kde.org
 Source0:        marble-%{version}.tar.xz
-BuildRequires:	kwindowsystem-devel
-BuildRequires:	plasma-framework-devel
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  gpsd-devel
@@ -47,12 +46,14 @@ BuildRequires:  kparts-devel
 BuildRequires:  krunner-devel
 BuildRequires:  kservice-devel
 BuildRequires:  kwallet-devel
+BuildRequires:  kwindowsystem-devel
 BuildRequires:  libqt5-qtlocation-devel
 BuildRequires:  libquazip-qt5-devel
 BuildRequires:  libshp-devel
 BuildRequires:  perl
 BuildRequires:  phonon4qt5-devel
 BuildRequires:  pkgconfig
+BuildRequires:  plasma-framework-devel
 BuildRequires:  pkgconfig(Qt5Concurrent) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5Core) >= 5.2.0
 BuildRequires:  pkgconfig(Qt5DBus) >= 5.2.0
@@ -74,11 +75,11 @@ Requires:       libastro%{_so_astro} = %{version}
 Requires:       libmarblewidget-qt5%{_so} = %{version}
 Requires:       marble-frontend = %{version}
 Recommends:     %{name}-doc = %{version}
+Obsoletes:      marble5 < %{version}
+Provides:       marble5 < %{version}
 %if %{with lang}
 Recommends:     %{name}-lang
 %endif
-Obsoletes:      marble5 < %{version}
-Provides:       marble5 < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -186,7 +187,8 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %files
 %defattr(-,root,root)
 %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
-%exclude %{_kf5_sharedir}/marble/data
+%config %{_kf5_configdir}/marble.knsrc
+%exclude %{_datadir}/marble/data
 %{_kf5_applicationsdir}/marble_geo.desktop
 %{_kf5_applicationsdir}/marble_geojson.desktop
 %{_kf5_applicationsdir}/marble_gpx.desktop
@@ -195,7 +197,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %{_kf5_applicationsdir}/marble_shp.desktop
 %{_kf5_applicationsdir}/marble_worldwind.desktop
 %{_kf5_appstreamdir}/
-%{_kf5_configdir}/marble.knsrc
 %{_kf5_configkcfgdir}/
 %{_kf5_iconsdir}/hicolor/*/apps/marble.*
 %{_kf5_kxmlguidir}/marble/
@@ -214,19 +215,19 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %doc BUGS CODING
 %{_includedir}/astro/
 %{_includedir}/marble/
-%{_kf5_libdir}/cmake/Astro/
-%{_kf5_libdir}/cmake/Marble/
+%{_kf5_cmakedir}/Astro/
+%{_kf5_cmakedir}/Marble/
 %{_kf5_libdir}/libastro.so
 %{_kf5_libdir}/libmarblewidget-qt5.so
-%{_kf5_libdir}/qt5/mkspecs/modules/qt_Marble.pri
+%{_kf5_mkspecsdir}/qt_Marble.pri
 
 %files data
 %defattr(-,root,root)
-%{_kf5_sharedir}/marble/data
+%{_datadir}/marble/data
 
 %files doc
 %defattr(-,root,root)
-%{_kf5_htmldir}/en/marble/
+%doc %lang(en) %{_kf5_htmldir}/en/marble/
 
 %files -n libmarblewidget-qt5%{_so}
 %defattr(-,root,root)
@@ -245,9 +246,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %defattr(-,root,root)
 %{_kf5_applicationsdir}/org.kde.marble.desktop
 %{_kf5_bindir}/marble
-%dir %{_kf5_sharedir}/plasma
-%{_kf5_sharedir}/plasma/plasmoids/
-%{_kf5_sharedir}/plasma/wallpapers/
+%dir %{_datadir}/plasma
+%{_datadir}/plasma/plasmoids/
+%{_datadir}/plasma/wallpapers/
 
 %if %{with lang}
 %files lang -f %{name}.lang