- updated to 18.12.1; ninja

diff --git a/ka5-kitinerary.spec b/ka5-kitinerary.spec
index b5014617e4e3389480bac15141d69507b509f3e8..2f2cecb783b832172c64645a7db8449ad76f5e7e 100644 (file)
--- a/ka5-kitinerary.spec
+++ b/ka5-kitinerary.spec
@@ -1,14 +1,14 @@
-%define                kdeappsver      18.12.0
+%define                kdeappsver      18.12.1
 %define                qtver           5.9.0
 %define                kaname          kitinerary
 Summary:       kitinerary
 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: f718dce9543effd386f40ed7adf859fc
+# Source0-md5: 6bfadbd4093d20524e2d0879cdf2c9fa
 URL:           http://www.kde.org/
 BuildRequires: gettext-devel
 BuildRequires: Qt5Core-devel >= %{qtver}
@@ -19,14 +19,15 @@ BuildRequires:      Qt5Qml-devel
 BuildRequires: Qt5Test-devel
 BuildRequires: Qt5Test-devel
 BuildRequires: cmake >= 2.8.12
-BuildRequires: ka5-kcalcore-devel >= 18.12.0
-BuildRequires: ka5-kcontacts-devel >= 18.12.0
-BuildRequires: ka5-kmime-devel >= 18.12.0
+BuildRequires: ka5-kcalcore-devel >= %{kdeappsver}
+BuildRequires: ka5-kcontacts-devel >= %{kdeappsver}
+BuildRequires: ka5-kmime-devel >= %{kdeappsver}
 BuildRequires: ka5-kpkpass-devel
 BuildRequires: kf5-extra-cmake-modules >= 5.53.0
 BuildRequires: kf5-karchive-devel >= 5.51.0
 BuildRequires: kf5-ki18n-devel >= 5.51.0
 BuildRequires: libxml2-devel
+BuildRequires: ninja
 BuildRequires: qt5-build >= %{qtver}
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: shared-mime-info
@@ -58,14 +59,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