From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sat, 12 Jan 2019 16:17:32 +0000 (+0100)
Subject: - updated to 18.12.1; ninja
X-Git-Tag: auto/th/ka5-cantor-18.12.1-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fka5-cantor.git;a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fka5-cantor-18.12.1-1

- updated to 18.12.1; ninja
---

diff --git a/ka5-cantor.spec b/ka5-cantor.spec
index 30dd427..678cc8c 100644
--- a/ka5-cantor.spec
+++ b/ka5-cantor.spec
@@ -1,14 +1,14 @@
-%define		kdeappsver	18.12.0
+%define		kdeappsver	18.12.1
 %define		qtver		5.9.0
 %define		kaname		cantor
 Summary:	Cantor
 Name:		ka5-%{kaname}
-Version:	18.12.0
+Version:	18.12.1
 Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
 Source0:	http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5:	4d98ff2c425beb73935a5558fd3a4988
+# Source0-md5:	d8dd65e5256f1c9e3dbb74bde0d95593
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel
@@ -39,6 +39,7 @@ BuildRequires:	kf5-ktextwidgets-devel >= 5.49.0
 BuildRequires:	kf5-kxmlgui-devel >= 5.49.0
 BuildRequires:	kf5-syntax-highlighting-devel >= 5.49.0
 BuildRequires:	libqalculate-devel >= 2.8.2
+BuildRequires:	ninja
 BuildRequires:	qt5-build >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	shared-mime-info
@@ -83,14 +84,14 @@ Pliki nagłówkowe dla programistów używających %{kaname}.
 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