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

witekfl witekfl at pld-linux.org
Sat Jan 12 23:37:09 CET 2019


commit d91e411f1fd2ea9edf2e03dd73ad3a10cc3277fc
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Sat Jan 12 23:37:01 2019 +0100

    - updated to 18.12.1; ninja

 ka5-kmail.spec | 59 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 29 deletions(-)
---
diff --git a/ka5-kmail.spec b/ka5-kmail.spec
index c53c42c..f782418 100644
--- a/ka5-kmail.spec
+++ b/ka5-kmail.spec
@@ -1,14 +1,14 @@
-%define		kdeappsver	18.12.0
+%define		kdeappsver	18.12.1
 %define		qtver		5.9.0
 %define		kaname		kmail
 Summary:	kmail
 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:	10fd41b581e947306e8925e943bf7581
+# Source0-md5:	e6b671e85313439a3172b672f284d3cb
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel
@@ -25,29 +25,29 @@ BuildRequires:	Qt5Widgets-devel
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	gettext-devel
 BuildRequires:	gpgme-c++-devel >= 1.8.0
-BuildRequires:	ka5-akonadi-contacts-devel >= 18.12.0
-BuildRequires:	ka5-akonadi-devel >= 18.12.0
-BuildRequires:	ka5-akonadi-mime-devel >= 18.12.0
-BuildRequires:	ka5-akonadi-search-devel >= 18.12.0
-BuildRequires:	ka5-kcalcore-devel >= 18.12.0
-BuildRequires:	ka5-kcalutils-devel >= 18.12.0
-BuildRequires:	ka5-kcontacts-devel >= 18.12.0
-BuildRequires:	ka5-kdepim-apps-libs-devel >= 18.12.0
-BuildRequires:	ka5-kidentitymanagement-devel >= 18.12.0
-BuildRequires:	ka5-kldap-devel >= 18.12.0
-BuildRequires:	ka5-kmailtransport-devel >= 18.12.0
-BuildRequires:	ka5-kmime-devel >= 18.12.0
-BuildRequires:	ka5-kontactinterface-devel >= 18.12.0
-BuildRequires:	ka5-kpimtextedit-devel >= 18.12.0
-BuildRequires:	ka5-ktnef-devel >= 18.12.0
-BuildRequires:	ka5-libgravatar-devel >= 18.12.0
-BuildRequires:	ka5-libkdepim-devel >= 18.12.0
-BuildRequires:	ka5-libkleo-devel >= 18.12.0
-BuildRequires:	ka5-libksieve-devel >= 18.12.0
-BuildRequires:	ka5-mailcommon-devel >= 18.12.0
-BuildRequires:	ka5-messagelib-devel >= 18.12.0
-BuildRequires:	ka5-messagelib-devel >= 18.12.0
-BuildRequires:	ka5-pimcommon-devel >= 18.12.0
+BuildRequires:	ka5-akonadi-contacts-devel >= %{kdeappsver}
+BuildRequires:	ka5-akonadi-devel >= %{kdeappsver}
+BuildRequires:	ka5-akonadi-mime-devel >= %{kdeappsver}
+BuildRequires:	ka5-akonadi-search-devel >= %{kdeappsver}
+BuildRequires:	ka5-kcalcore-devel >= %{kdeappsver}
+BuildRequires:	ka5-kcalutils-devel >= %{kdeappsver}
+BuildRequires:	ka5-kcontacts-devel >= %{kdeappsver}
+BuildRequires:	ka5-kdepim-apps-libs-devel >= %{kdeappsver}
+BuildRequires:	ka5-kidentitymanagement-devel >= %{kdeappsver}
+BuildRequires:	ka5-kldap-devel >= %{kdeappsver}
+BuildRequires:	ka5-kmailtransport-devel >= %{kdeappsver}
+BuildRequires:	ka5-kmime-devel >= %{kdeappsver}
+BuildRequires:	ka5-kontactinterface-devel >= %{kdeappsver}
+BuildRequires:	ka5-kpimtextedit-devel >= %{kdeappsver}
+BuildRequires:	ka5-ktnef-devel >= %{kdeappsver}
+BuildRequires:	ka5-libgravatar-devel >= %{kdeappsver}
+BuildRequires:	ka5-libkdepim-devel >= %{kdeappsver}
+BuildRequires:	ka5-libkleo-devel >= %{kdeappsver}
+BuildRequires:	ka5-libksieve-devel >= %{kdeappsver}
+BuildRequires:	ka5-mailcommon-devel >= %{kdeappsver}
+BuildRequires:	ka5-messagelib-devel >= %{kdeappsver}
+BuildRequires:	ka5-messagelib-devel >= %{kdeappsver}
+BuildRequires:	ka5-pimcommon-devel >= %{kdeappsver}
 BuildRequires:	kf5-extra-cmake-modules >= 5.51.0
 BuildRequires:	kf5-kbookmarks-devel >= 5.51.0
 BuildRequires:	kf5-kcmutils-devel >= 5.51.0
@@ -72,6 +72,7 @@ BuildRequires:	kf5-kwidgetsaddons-devel >= 5.51.0
 BuildRequires:	kf5-kwindowsystem-devel >= 5.51.0
 BuildRequires:	kf5-kxmlgui-devel >= 5.51.0
 BuildRequires:	kf5-sonnet-devel >= 5.51.0
+BuildRequires:	ninja
 BuildRequires:	qt5-build >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	shared-mime-info
@@ -90,14 +91,14 @@ information manager from KDE.
 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-kmail.git/commitdiff/d91e411f1fd2ea9edf2e03dd73ad3a10cc3277fc



More information about the pld-cvs-commit mailing list