[packages/ka5-kontact] - updated to 18.12.1; ninja

witekfl witekfl at pld-linux.org
Sun Jan 13 11:30:25 CET 2019


commit 0cfd155d2794f4405d22071f3fa5a809615f1cab
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Sun Jan 13 11:30:19 2019 +0100

    - updated to 18.12.1; ninja

 ka5-kontact.spec | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/ka5-kontact.spec b/ka5-kontact.spec
index c11aca7..0467b8a 100644
--- a/ka5-kontact.spec
+++ b/ka5-kontact.spec
@@ -1,14 +1,14 @@
-%define		kdeappsver	18.12.0
+%define		kdeappsver	18.12.1
 %define		qtver		5.9.0
 %define		kaname		kontact
 Summary:	kontact
 Name:		ka5-%{kaname}
-Version:	18.12.0
+Version:	18.12.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:	aca8ba0fcb88a91757523f93079bc9c7
+# Source0-md5:	d67b762bd70590b413c602a8d8f88716
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel
@@ -23,12 +23,12 @@ BuildRequires:	Qt5WebEngine-devel
 BuildRequires:	Qt5Widgets-devel
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	gettext-devel
-BuildRequires:	ka5-akonadi-devel >= 18.12.0
-BuildRequires:	ka5-grantleetheme-devel >= 18.12.0
-BuildRequires:	ka5-kdepim-apps-libs-devel >= 18.12.0
-BuildRequires:	ka5-kontactinterface-devel >= 18.12.0
-BuildRequires:	ka5-kpimtextedit-devel >= 18.12.0
-BuildRequires:	ka5-libkdepim-devel >= 18.12.0
+BuildRequires:	ka5-akonadi-devel >= %{kdeappsver}
+BuildRequires:	ka5-grantleetheme-devel >= %{kdeappsver}
+BuildRequires:	ka5-kdepim-apps-libs-devel >= %{kdeappsver}
+BuildRequires:	ka5-kontactinterface-devel >= %{kdeappsver}
+BuildRequires:	ka5-kpimtextedit-devel >= %{kdeappsver}
+BuildRequires:	ka5-libkdepim-devel >= %{kdeappsver}
 BuildRequires:	kf5-extra-cmake-modules >= 5.51.0
 BuildRequires:	kf5-kcmutils-devel >= 5.51.0
 BuildRequires:	kf5-kcrash-devel >= 5.51.0
@@ -36,6 +36,7 @@ BuildRequires:	kf5-kdbusaddons-devel >= 5.51.0
 BuildRequires:	kf5-kdoctools-devel >= 5.51.0
 BuildRequires:	kf5-kiconthemes-devel >= 5.51.0
 BuildRequires:	kf5-kwindowsystem-devel >= 5.51.0
+BuildRequires:	ninja
 BuildRequires:	qt5-build >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	shared-mime-info
@@ -57,14 +58,14 @@ functionality.
 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
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ka5-kontact.git/commitdiff/0cfd155d2794f4405d22071f3fa5a809615f1cab



More information about the pld-cvs-commit mailing list