From 20669d8f5a6d3229e7d8cc41b821c1aabee17b87 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Mon, 13 May 2019 11:40:11 +0200 Subject: [PATCH] - updated to 19.04.1 - packaged docs - macro kframever --- ka5-marble.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ka5-marble.spec b/ka5-marble.spec index d67aba1..2a26089 100644 --- a/ka5-marble.spec +++ b/ka5-marble.spec @@ -1,14 +1,15 @@ -%define kdeappsver 18.12.1 +%define kdeappsver 19.04.1 +%define kframever 5.56.0 %define qtver 5.9.0 %define kaname marble Summary: marble Name: ka5-%{kaname} -Version: 18.12.1 +Version: 19.04.1 Release: 1 License: GPL v2+/LGPL v2.1+ Group: X11/Applications Source0: http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz -# Source0-md5: e15d6bd92c7a922d4491a34f651d2f88 +# Source0-md5: a36981792efc95151234e076615d4e60 URL: http://www.kde.org/ BuildRequires: Qt5Concurrent-devel BuildRequires: Qt5Core-devel >= %{qtver} @@ -17,6 +18,7 @@ BuildRequires: Qt5Network-devel BuildRequires: Qt5PrintSupport-devel BuildRequires: Qt5Qml-devel >= 5.11.1 BuildRequires: Qt5Quick-devel +BuildRequires: Qt5SerialPort-devel BuildRequires: Qt5Sql-devel BuildRequires: Qt5Svg-devel BuildRequires: Qt5Test-devel @@ -24,7 +26,7 @@ BuildRequires: Qt5Widgets-devel BuildRequires: Qt5Xml-devel BuildRequires: cmake >= 2.8.12 BuildRequires: gettext-devel -BuildRequires: kf5-extra-cmake-modules >= 5.53.0 +BuildRequires: kf5-extra-cmake-modules >= %{kframever} BuildRequires: ninja BuildRequires: qt5-build >= %{qtver} BuildRequires: rpmbuild(macros) >= 1.164 @@ -72,6 +74,7 @@ install -d build cd build %cmake \ -G Ninja \ + -DHTML_INSTALL_DIR=%{_kdedocdir} \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ .. %ninja_build @@ -80,7 +83,8 @@ cd build rm -rf $RPM_BUILD_ROOT %ninja_install -C build -%find_lang %{kaname} --all-name --with-qm +rm -rf $RPM_BUILD_ROOT%{_kdedocdir}/lt +%find_lang %{kaname} --all-name --with-kde --with-qm %clean rm -rf $RPM_BUILD_ROOT @@ -139,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/marble %{_datadir}/metainfo/org.kde.marble.appdata.xml %{_datadir}/metainfo/org.kde.plasma.worldclock.appdata.xml -#%%{_datadir}/metainfo/org.kde.plasma.worldmap.appdata.xml +%{_datadir}/metainfo/org.kde.plasma.worldmap.appdata.xml %{_datadir}/mime/packages/geo.xml %{_datadir}/plasma/plasmoids/org.kde.plasma.worldclock %{_datadir}/plasma/wallpapers/org.kde.plasma.worldmap -- 2.44.0