- updated to 5.96.0

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

diff --git a/kf5-kdbusaddons.spec b/kf5-kdbusaddons.spec
index bc92ec5972a22bbd1c806edda9733e8393deed19..2940e45328c3cbc8db68bcffabaf63b951e22582 100644 (file)
--- a/kf5-kdbusaddons.spec
+++ b/kf5-kdbusaddons.spec
@@ -6,30 +6,31 @@
 # - runtime Requires if any
 # - make test not hanging and switch it back on
 
-%define                kdeframever     5.19
-%define                qtver           5.3.2
+%define                kdeframever     5.96
+%define                qtver           5.15.2
 %define                kfname          kdbusaddons
 Summary:       Convenience classes for DBus
 Name:          kf5-%{kfname}
-Version:       5.19.0
+Version:       5.96.0
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
-Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5: 4ef9082483a46d04f531d1dce8be4232
+Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5: eeea73d9713611c2e8f0d05d0255c0b6
 URL:           http://www.kde.org/
-BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5DBus-devel >= %{qtver}
-BuildRequires: Qt5Gui-devel >= %{qtver}
-BuildRequires: Qt5Test-devel >= %{qtver}
-BuildRequires: Qt5Widgets-devel >= %{qtver}
+%{?with_tests:BuildRequires:   Qt5Test-devel >= %{qtver}}
 BuildRequires: Qt5X11Extras-devel >= %{qtver}
-BuildRequires: cmake >= 2.8.12
-BuildRequires: kf5-extra-cmake-modules >= 1.4.0
+BuildRequires: cmake >= 3.16
+BuildRequires: kf5-extra-cmake-modules >= %{version}
+BuildRequires: ninja
 BuildRequires: qt5-linguist >= %{qtver}
-BuildRequires: rpmbuild(macros) >= 1.164
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+Requires:      Qt5DBus >= %{qtver}
+Requires:      Qt5X11Extras >= %{qtver}
+Requires:      kf5-dirs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                qt5dir          %{_libdir}/qt5
@@ -43,6 +44,8 @@ Summary:      Header files for %{kfname} development
 Summary(pl.UTF-8):     Pliki nagłówkowe dla programistów używających %{kfname}
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      Qt5DBus-devel >= %{qtver}
+Requires:      cmake >= 3.16
 
 %description devel
 Header files for %{kfname} development.
@@ -56,17 +59,18 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
+       %{!?with_tests:-DBUILD_TESTING=OFF} \
        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
        ../
-%{__make}
+%ninja_build
+
+%{?with_tests:%ninja_build test}
 
-%{?with_tests:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
-        DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %find_lang %{kfname}5_qt --with-qm --all-name --with-kde
 
@@ -81,12 +85,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc MAINTAINER README.md
 %attr(755,root,root) %{_bindir}/kquitapp5
 %attr(755,root,root) %{_libdir}/libKF5DBusAddons.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libKF5DBusAddons.so.5
+%ghost %{_libdir}/libKF5DBusAddons.so.5
+%{_datadir}/qlogging-categories5/kdbusaddons.categories
+%{_datadir}/qlogging-categories5/kdbusaddons.renamecategories
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/KF5/KDBusAddons
-%{_includedir}/KF5/kdbusaddons_version.h
-%attr(755,root,root) %{_libdir}/libKF5DBusAddons.so
+%{_libdir}/libKF5DBusAddons.so
 %{_libdir}/cmake/KF5DBusAddons
 %{qt5dir}/mkspecs/modules/qt_KDBusAddons.pri