From bfec29929fa78fd102fc82c046f9e72eefc436fe6f26272ffaae88e62b077670 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke@gmail.com>
Date: Mon, 5 Dec 2016 12:59:51 +0000
Subject: [PATCH] Accepting request 443839 from home:wolfi323:test

- Use proper cmake macro for building, remove obsolete WITH_KF5 option

OBS-URL: https://build.opensuse.org/request/show/443839
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=117
---
 marble.changes |  6 ++++++
 marble.spec    | 29 ++---------------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/marble.changes b/marble.changes
index b3e3504..29c08d8 100644
--- a/marble.changes
+++ b/marble.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  5 10:35:37 UTC 2016 - wbauer@tmo.at
+
+- Use proper cmake macro for building, remove obsolete WITH_KF5
+  option
+
 -------------------------------------------------------------------
 Sat Dec  3 16:45:54 UTC 2016 - tittiatcoke@gmail.com
 
diff --git a/marble.spec b/marble.spec
index 5c665af..313d6b1 100644
--- a/marble.spec
+++ b/marble.spec
@@ -155,37 +155,12 @@ export SUSE_ASNEEDED=0
 %ifarch ppc ppc64
 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %endif
-mkdir build
-cd build
-# FIXME: you should use %%cmake macros
-cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
-      -DCMAKE_INSTALL_PREFIX=%{_kf5_prefix} \
-      -DCMAKE_PREFIX_PATH=%{_kf5_prefix} \
-      -DKDE_INSTALL_LIBDIR=%{_lib} \
-      -DKDE_INSTALL_SYSCONFDIR=%{_kf5_sysconfdir} \
-      -DKDE_INSTALL_QTPLUGINDIR=%{_lib}/qt5/plugins \
-      -DKDE_INSTALL_PLUGINDIR=%{_lib}/qt5/plugins \
-      -DKDE_INSTALL_QMLDIR=%{_lib}/qt5/qml \
-      -DKDE_INSTALL_QTQUICKIMPORTSDIR=%{_lib}/qt5/imports \
-      -DECM_MKSPECS_INSTALL_DIR=%{_kf5_mkspecsdir} \
-      -DBUILD_TESTING=OFF \
-      -DBUILD_MARBLE_TESTS=NO \
-      -DMOBILE=FALSE \
-%ifarch x86_64
-      -DLIB_SUFFIX=64 \
-%endif
-	  -DWITH_KF5=TRUE \
-      ..
+%cmake_kf5 -d build -- -DBUILD_MARBLE_TESTS=NO -DMOBILE=FALSE
 %make_jobs
 
 %install
   %kf5_makeinstall -C build
   %fdupes -s %{buildroot}
-  rm -rf %{buildroot}/designer
-  #rm -rf %{buildroot}%{_bindir}/marble-mobile
-  rm -rf %{buildroot}%{_bindir}/marble-touch
-  #rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-mobile.desktop
-  rm -rf %{buildroot}%{_kf5_applicationsdir}/marble-touch.desktop
 
 %post   -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
 %postun -n libmarblewidget-qt5%{_so} -p /sbin/ldconfig
@@ -196,7 +171,7 @@ cmake -DCMAKE_BUILD_TYPE=%{_kf5_build_type} \
 %defattr(-,root,root)
 %doc CREDITS ChangeLog COPYING* LICENSE* MANIFESTO.txt
 %{_datadir}/marble/
-%{_datadir}/metainfo/
+%{_kf5_appstreamdir}/
 %{_kf5_iconsdir}/hicolor/*/apps/marble.*
 %{_libdir}/marble/
 %{_libdir}/libmarbledeclarative.so