From d8cd9e21d1eb9b15cafcd15bc1c1fe2f5b9ad3eba6ff9c0d5169ac13a2838af2 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 6 Aug 2017 07:09:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=143

---
 marble.spec | 60 +++++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/marble.spec b/marble.spec
index 2e368ff..8df1017 100644
--- a/marble.spec
+++ b/marble.spec
@@ -17,7 +17,7 @@
 
 %bcond_without lang
 
-%define _so -27
+%define _so -28
 %define _so_astro 1
 Name:           marble
 Version:        17.07.90
@@ -31,6 +31,8 @@ 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,6 +49,7 @@ BuildRequires:  kservice-devel
 BuildRequires:  kwallet-devel
 BuildRequires:  libqt5-qtlocation-devel
 BuildRequires:  libquazip-qt5-devel
+BuildRequires:  libshp-devel
 BuildRequires:  perl
 BuildRequires:  phonon4qt5-devel
 BuildRequires:  pkgconfig
@@ -71,9 +74,11 @@ Requires:       libastro%{_so_astro} = %{version}
 Requires:       libmarblewidget-qt5%{_so} = %{version}
 Requires:       marble-frontend = %{version}
 Recommends:     %{name}-doc = %{version}
+%if %{with lang}
+Recommends:     %{name}-lang
+%endif
 Obsoletes:      marble5 < %{version}
 Provides:       marble5 < %{version}
-Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -181,42 +186,43 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %files
 %defattr(-,root,root)
 %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
-%{_datadir}/marble/
-%{_kf5_appstreamdir}/
-%{_kf5_iconsdir}/hicolor/*/apps/marble.*
-%{_libdir}/marble/
-%{_libdir}/libmarbledeclarative.so
-%{_kf5_plugindir}/designer/
-%exclude %{_datadir}/marble/data
-%{_kf5_plugindir}/libmarble*so
-%{_kf5_plugindir}/plasma_runner_marble.so
-%{_kf5_servicesdir}/*desktop
+%exclude %{_kf5_sharedir}/marble/data
+%{_kf5_applicationsdir}/marble_geo.desktop
+%{_kf5_applicationsdir}/marble_geojson.desktop
 %{_kf5_applicationsdir}/marble_gpx.desktop
 %{_kf5_applicationsdir}/marble_kml.desktop
 %{_kf5_applicationsdir}/marble_kmz.desktop
-%{_kf5_applicationsdir}/marble_geo.desktop
+%{_kf5_applicationsdir}/marble_shp.desktop
 %{_kf5_applicationsdir}/marble_worldwind.desktop
-%{_kf5_applicationsdir}/marble_geojson.desktop
-%{_kf5_configkcfgdir}/
-%{_kf5_kxmlguidir}/marble/
-%{_datadir}/mime/packages/geo.xml
-%{_kf5_qmldir}/org/kde/marble/
+%{_kf5_appstreamdir}/
 %{_kf5_configdir}/marble.knsrc
+%{_kf5_configkcfgdir}/
+%{_kf5_iconsdir}/hicolor/*/apps/marble.*
+%{_kf5_kxmlguidir}/marble/
+%{_kf5_libdir}/libmarbledeclarative.so
+%{_kf5_libdir}/marble/
+%{_kf5_plugindir}/designer/
+%{_kf5_plugindir}/libmarble*so
+%{_kf5_plugindir}/plasma_runner_marble.so
+%{_kf5_qmldir}/org/kde/marble/
+%{_kf5_servicesdir}/*desktop
+%{_kf5_sharedir}/marble/
+%{_kf5_sharedir}/mime/packages/geo.xml
 
 %files devel
 %defattr(-,root,root)
 %doc BUGS CODING
-%{_includedir}/marble/
-%{_includedir}/astro/
-%{_kf5_libdir}/libmarblewidget-qt5.so
-%{_kf5_libdir}/libastro.so
+%{_kf5_includedir}/astro/
+%{_kf5_includedir}/marble/
 %{_kf5_libdir}/cmake/Astro/
 %{_kf5_libdir}/cmake/Marble/
-%{_libdir}/qt5/mkspecs/modules/qt_Marble.pri
+%{_kf5_libdir}/libastro.so
+%{_kf5_libdir}/libmarblewidget-qt5.so
+%{_kf5_libdir}/qt5/mkspecs/modules/qt_Marble.pri
 
 %files data
 %defattr(-,root,root)
-%{_datadir}/marble/data
+%{_kf5_sharedir}/marble/data
 
 %files doc
 %defattr(-,root,root)
@@ -239,9 +245,9 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %defattr(-,root,root)
 %{_kf5_applicationsdir}/org.kde.marble.desktop
 %{_kf5_bindir}/marble
-%dir %{_datadir}/plasma
-%{_datadir}/plasma/plasmoids/
-%{_datadir}/plasma/wallpapers/
+%dir %{_kf5_sharedir}/plasma
+%{_kf5_sharedir}/plasma/plasmoids/
+%{_kf5_sharedir}/plasma/wallpapers/
 
 %if %{with lang}
 %files lang -f %{name}.lang