From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Mon, 13 May 2019 09:22:17 +0000 (+0200)
Subject: - updated to 19.04.1
X-Git-Tag: auto/th/ka5-akonadi-contacts-19.04.1-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fka5-akonadi-contacts.git;a=commitdiff_plain;h=7ba812b08a71aae5b4fed02ab27a8a4cb3f6becd

- updated to 19.04.1
- packaged docs
- macro kframever
---

diff --git a/ka5-akonadi-contacts.spec b/ka5-akonadi-contacts.spec
index 77527dd..bca5bc4 100644
--- a/ka5-akonadi-contacts.spec
+++ b/ka5-akonadi-contacts.spec
@@ -1,14 +1,14 @@
-%define		kdeappsver	18.12.1
+%define		kdeappsver	19.04.1
 %define		qtver		5.9.0
 %define		kaname		akonadi-contacts
 Summary:	Akonadi Contacts
 Name:		ka5-%{kaname}
-Version:	18.12.1
+Version:	19.04.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:	b3f6da05ea1bcd1f7f42ddee986386e7
+# Source0-md5:	71c513ff87595e8bcb7580105f48ae96
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= 5.11.1
@@ -28,6 +28,7 @@ BuildRequires:	kf5-kiconthemes-devel >= 5.51.0
 BuildRequires:	kf5-kio-devel >= 5.51.0
 BuildRequires:	kf5-ktextwidgets-devel >= 5.51.0
 BuildRequires:	kf5-prison-devel >= 5.51.0
+BuildRequires:	ninja
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,15 +58,15 @@ Pliki nagłówkowe dla programistów używających %{kaname}.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
+	-DHTML_INSTALL_DIR=%{_kdedocdir} \
 	-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