- updated to 19.04.1

- packaged docs
- macro kframever

diff --git a/ka5-akonadi-calendar.spec b/ka5-akonadi-calendar.spec
index e525aab7280618195b30a64285d8d0e7361f7e07..53c7603a2c1cfd227a7e1a82f94ee00f1f67909a 100644 (file)
--- a/ka5-akonadi-calendar.spec
+++ b/ka5-akonadi-calendar.spec
@@ -1,14 +1,15 @@
-%define                kdeappsver      18.12.1
+%define                kdeappsver      19.04.1
+%define                kframever       5.56.0
 %define                qtver           5.9.0
 %define                kaname          akonadi-calendar
 Summary:       Akonadi Calendar
 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: df98c58b61070d252761bcc3be997b4e
+# Source0-md5: dae6424f253352054839351f41bb3ab5
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5Gui-devel >= 5.11.1
@@ -22,12 +23,13 @@ BuildRequires:      ka5-kcalutils-devel >= %{kdeappsver}
 BuildRequires: ka5-kcontacts-devel >= %{kdeappsver}
 BuildRequires: ka5-kidentitymanagement-devel >= %{kdeappsver}
 BuildRequires: ka5-kmailtransport-devel >= %{kdeappsver}
-BuildRequires: kf5-extra-cmake-modules >= 5.53.0
-BuildRequires: kf5-kcodecs-devel >= 5.51.0
-BuildRequires: kf5-kdbusaddons-devel >= 5.51.0
-BuildRequires: kf5-kiconthemes-devel >= 5.51.0
-BuildRequires: kf5-kio-devel >= 5.51.0
-BuildRequires: kf5-kwallet-devel >= 5.51.0
+BuildRequires: kf5-extra-cmake-modules >= %{kframever}
+BuildRequires: kf5-kcodecs-devel >= %{kframever}
+BuildRequires: kf5-kdbusaddons-devel >= %{kframever}
+BuildRequires: kf5-kiconthemes-devel >= %{kframever}
+BuildRequires: kf5-kio-devel >= %{kframever}
+BuildRequires: kf5-kwallet-devel >= %{kframever}
+BuildRequires: ninja
 BuildRequires: qt5-build >= %{qtver}
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: shared-mime-info
@@ -60,15 +62,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