- updated to 18.12.1; ninja

diff --git a/ka5-kdepim-runtime.spec b/ka5-kdepim-runtime.spec
index 67529b7feed03952bcf0fd49d85332ccfe1c0539..62ea1ba2a956f1ba6f74a75fee29fb93563c002b 100644 (file)
--- a/ka5-kdepim-runtime.spec
+++ b/ka5-kdepim-runtime.spec
@@ -1,14 +1,14 @@
-%define                kdeappsver      18.12.0
+%define                kdeappsver      18.12.1
 %define                qtver           5.9.0
 %define                kaname          kdepim-runtime
 Summary:       kdepim runtime
 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: a5021c314ec019f2b68c230ad3eeee7d
+# Source0-md5: c42f836cc8a91921214a0c00ddc03cd9
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5DBus-devel
@@ -27,23 +27,23 @@ BuildRequires:      Qt5XmlPatterns-devel
 BuildRequires: cmake >= 2.8.12
 BuildRequires: cyrus-sasl-devel
 BuildRequires: gettext-devel
-BuildRequires: ka5-akonadi-calendar-devel >= 18.12.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-notes-devel >= 18.12.0
-BuildRequires: ka5-kalarmcal-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-kdav-devel >= 18.12.0
-BuildRequires: ka5-kidentitymanagement-devel >= 18.12.0
-BuildRequires: ka5-kimap-devel >= 18.12.0
-BuildRequires: ka5-kmailtransport-devel >= 18.12.0
-BuildRequires: ka5-kmbox-devel >= 18.12.0
-BuildRequires: ka5-kmime-devel >= 18.12.0
-BuildRequires: ka5-libkgapi-devel >= 18.12.0
-BuildRequires: ka5-pimcommon-devel >= 18.12.0
+BuildRequires: ka5-akonadi-calendar-devel >= %{kdeappsver}
+BuildRequires: ka5-akonadi-contacts-devel >= %{kdeappsver}
+BuildRequires: ka5-akonadi-devel >= %{kdeappsver}
+BuildRequires: ka5-akonadi-mime-devel >= %{kdeappsver}
+BuildRequires: ka5-akonadi-notes-devel >= %{kdeappsver}
+BuildRequires: ka5-kalarmcal-devel >= %{kdeappsver}
+BuildRequires: ka5-kcalcore-devel >= %{kdeappsver}
+BuildRequires: ka5-kcalutils-devel >= %{kdeappsver}
+BuildRequires: ka5-kcontacts-devel >= %{kdeappsver}
+BuildRequires: ka5-kdav-devel >= %{kdeappsver}
+BuildRequires: ka5-kidentitymanagement-devel >= %{kdeappsver}
+BuildRequires: ka5-kimap-devel >= %{kdeappsver}
+BuildRequires: ka5-kmailtransport-devel >= %{kdeappsver}
+BuildRequires: ka5-kmbox-devel >= %{kdeappsver}
+BuildRequires: ka5-kmime-devel >= %{kdeappsver}
+BuildRequires: ka5-libkgapi-devel >= %{kdeappsver}
+BuildRequires: ka5-pimcommon-devel >= %{kdeappsver}
 BuildRequires: kf5-extra-cmake-modules >= 5.53.0
 BuildRequires: kf5-kcodecs-devel >= 5.51.0
 BuildRequires: kf5-kconfig-devel >= 5.51.0
@@ -60,6 +60,7 @@ BuildRequires:        kf5-knotifyconfig-devel >= 5.51.0
 BuildRequires: kf5-ktextwidgets-devel >= 5.51.0
 BuildRequires: kf5-kwindowsystem-devel >= 5.51.0
 BuildRequires: libxslt-progs
+BuildRequires: ninja
 BuildRequires: qt5-build >= %{qtver}
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: shared-mime-info
@@ -78,14 +79,14 @@ agents written using KDE Development Platform libraries.
 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