- Updated BR: kf5-extra-cmake-modules.

[packages/kf5-attica.git] / kf5-attica.spec

diff --git a/kf5-attica.spec b/kf5-attica.spec
index f5599f4fd6e8a5e3dde6c0bda2c4a9e5d6c9c423..fcfda4178c3c898d4407b611626f43fda4289443 100644 (file)
--- a/kf5-attica.spec
+++ b/kf5-attica.spec
@@ -1,21 +1,21 @@
 #
 # Conditional build:
-%bcond_without tests           # build without tests
+%bcond_with    tests           # build without tests
 
 # TODO:
 # - runtime Requires if any
 
-%define                kdeframever     5.43
-%define                qtver           5.3.2
+%define                kdeframever     5.67
+%define                qtver           5.9.0
 %define                kfname          attica
 Summary:       A Qt library that implements the Open Collaboration Services API
 Name:          kf5-%{kfname}
-Version:       5.43.0
+Version:       5.67.0
 Release:       1
 License:       GPL v2+/LGPL v2.1+
 Group:         X11/Libraries
 Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5: bb18451b29c20fc43899003e1b5d88bf
+# Source0-md5: d3b975029a5b53673ea6503a2d5ae177
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5Gui-devel >= %{qtver}
@@ -26,7 +26,8 @@ BuildRequires:        Qt5Gui-devel >= %{qtver}
 BuildRequires: Qt5Widgets-devel >= %{qtver}
 %endif
 BuildRequires: cmake >= 2.8.12
-BuildRequires: kf5-extra-cmake-modules >= 1.4.0
+BuildRequires: kf5-extra-cmake-modules >= %{version}
+BuildRequires: ninja
 BuildRequires: qt5-build >= %{qtver}
 BuildRequires: rpmbuild(macros) >= 1.164
 BuildRequires: tar >= 1:1.22
@@ -62,17 +63,16 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
        ..
-%{__make}
+%ninja_build
 
-%{?with_tests:%{__make} test}
+%{?with_tests:%ninja_build test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS README.md
 %attr(755,root,root) %{_libdir}/libKF5Attica.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libKF5Attica.so.5
-/etc/xdg/attica.categories
+%{_datadir}/qlogging-categories5/attica.categories
 
 %files devel
 %defattr(644,root,root,755)