- updated to 18.12.1; ninja

diff --git a/ka5-knotes.spec b/ka5-knotes.spec
index 9b0efcdba76c9152a8f13ea9be5cc73d906319c7..e3c147f1f1036fa7f8c1d29f80d7f574a5238d49 100644 (file)
--- a/ka5-knotes.spec
+++ b/ka5-knotes.spec
@@ -1,14 +1,14 @@
-%define                kdeappsver      18.12.0
+%define                kdeappsver      18.12.1
 %define                qtver           5.9.0
 %define                kaname          knotes
 Summary:       knotes
 Name:          ka5-%{kaname}
-Version:       18.12.0
+Version:       18.12.1
 Release:       1
 License:       GPL v2+/LGPL v2.1+
 Group:         X11/Applications/Games
 Source0:       http://download.kde.org/stable/applications/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
-# Source0-md5: a3cc030d0ccdf73329122bb9e9db1403
+# Source0-md5: 01531f482a635f562caec42acd30e515
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5DBus-devel
@@ -21,15 +21,15 @@ BuildRequires:      Qt5Xml-devel
 BuildRequires: cmake >= 2.8.12
 BuildRequires: gettext-devel
 BuildRequires: grantlee-qt5-devel >= 5.1
-BuildRequires: ka5-akonadi-devel >= 18.12.0
-BuildRequires: ka5-akonadi-notes-devel >= 18.12.0
-BuildRequires: ka5-akonadi-search-devel >= 18.12.0
-BuildRequires: ka5-kcalutils-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-libkdepim-devel >= 18.12.0
-BuildRequires: ka5-pimcommon-devel >= 18.12.0
+BuildRequires: ka5-akonadi-devel >= %{kdeappsver}
+BuildRequires: ka5-akonadi-notes-devel >= %{kdeappsver}
+BuildRequires: ka5-akonadi-search-devel >= %{kdeappsver}
+BuildRequires: ka5-kcalutils-devel >= %{kdeappsver}
+BuildRequires: ka5-kmime-devel >= %{kdeappsver}
+BuildRequires: ka5-kontactinterface-devel >= %{kdeappsver}
+BuildRequires: ka5-kpimtextedit-devel >= %{kdeappsver}
+BuildRequires: ka5-libkdepim-devel >= %{kdeappsver}
+BuildRequires: ka5-pimcommon-devel >= %{kdeappsver}
 BuildRequires: kf5-extra-cmake-modules >= 5.51.0
 BuildRequires: kf5-kcmutils-devel >= 5.51.0
 BuildRequires: kf5-kcompletion-devel >= 5.51.0
@@ -54,6 +54,7 @@ BuildRequires:        kf5-kwidgetsaddons-devel >= 5.51.0
 BuildRequires: kf5-kwindowsystem-devel >= 5.51.0
 BuildRequires: kf5-kxmlgui-devel >= 5.51.0
 BuildRequires: libxslt-progs
+BuildRequires: ninja
 BuildRequires: qt5-build >= %{qtver}
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: shared-mime-info
@@ -74,14 +75,14 @@ notes in your choice of font and background color.
 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