From f12154bd4c07ffc6051e216a4dd7477cb0a495af Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 12 Jan 2019 17:59:23 +0100 Subject: [PATCH] - updated to 18.12.1; ninja --- ka5-granatier.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ka5-granatier.spec b/ka5-granatier.spec index b9a54e6..db85974 100644 --- a/ka5-granatier.spec +++ b/ka5-granatier.spec @@ -1,14 +1,14 @@ -%define kdeappsver 18.12.0 +%define kdeappsver 18.12.1 %define qtver 5.9.0 %define kaname granatier Summary: Granatier Name: ka5-%{kaname} -Version: 18.12.0 +Version: 18.12.1 Release: 1 License: GPL v2+/LGPL v2.1+ Group: X11/Applications/Games Source0: http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz -# Source0-md5: a46aeb08db2c6134f730a5d722ca9929 +# Source0-md5: d90669e38ee1b768a8706f882a3201d1 URL: http://www.kde.org/ BuildRequires: Qt5Core-devel >= %{qtver} BuildRequires: Qt5Gui-devel >= 5.11.1 @@ -18,7 +18,7 @@ BuildRequires: Qt5Svg-devel BuildRequires: Qt5Widgets-devel BuildRequires: cmake >= 2.8.12 BuildRequires: gettext-devel -BuildRequires: ka5-libkdegames-devel >= 18.12.0 +BuildRequires: ka5-libkdegames-devel >= %{kdeappsver} BuildRequires: kf5-extra-cmake-modules >= 5.53.0 BuildRequires: kf5-kconfig-devel >= 5.30.0 BuildRequires: kf5-kconfigwidgets-devel >= 5.30.0 @@ -30,6 +30,7 @@ BuildRequires: kf5-ki18n-devel >= 5.30.0 BuildRequires: kf5-knewstuff-devel >= 5.30.0 BuildRequires: kf5-kwidgetsaddons-devel >= 5.30.0 BuildRequires: kf5-kxmlgui-devel >= 5.30.0 +BuildRequires: ninja BuildRequires: qt5-build >= %{qtver} BuildRequires: rpmbuild(macros) >= 1.164 BuildRequires: shared-mime-info @@ -48,14 +49,14 @@ work of the Clanbomber clone. install -d build cd build %cmake \ + -G Ninja \ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \ .. -%{__make} +%ninja_build %install rm -rf $RPM_BUILD_ROOT -%{__make} -C build install \ - DESTDIR=$RPM_BUILD_ROOT +%ninja_install -C build %find_lang %{kaname} --all-name --with-kde -- 2.43.0