- updated to 5.115.0

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

diff --git a/kf5-kwidgetsaddons.spec b/kf5-kwidgetsaddons.spec
index 7a14098784d5e6dc87be23fd191512226d924b19..ba4c234ac5dca0c27a76e503145e9babc93bc4d0 100644 (file)
--- a/kf5-kwidgetsaddons.spec
+++ b/kf5-kwidgetsaddons.spec
@@ -1,27 +1,32 @@
-%define                kdeframever     5.24
-%define                qtver           5.3.2
+#
+# Conditional build:
+%bcond_with    tests           # build with tests
+%define                kdeframever     5.115
+%define                qtver           5.15.2
 %define                kfname          kwidgetsaddons
 
 Summary:       Large set of desktop widgets
 Name:          kf5-%{kfname}
-Version:       5.24.0
+Version:       5.115.0
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
-Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5: 841740260585143afbdf6240289cce31
+Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5: 148cb8009939e1ae53928d0d75111efb
+Patch0:                failed-tests.patch
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
-BuildRequires: Qt5Gui-devel >= %{qtver}
 BuildRequires: Qt5Test-devel >= %{qtver}
 BuildRequires: Qt5UiTools-devel >= %{qtver}
 BuildRequires: Qt5Widgets-devel >= %{qtver}
-BuildRequires: cmake >= 2.8.12
-BuildRequires: kf5-extra-cmake-modules >= 1.0.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:      Qt5Widgets >= %{qtver}
 Requires:      kf5-dirs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,6 +53,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:      Qt5Widgets-devel >= %{qtver}
+Requires:      cmake >= 3.16
 
 %description devel
 Header files for %{kfname} development.
@@ -57,20 +64,24 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 
 %prep
 %setup -q -n %{kfname}-%{version}
+#%%patch0 -p1
 
 %build
-install -d build
-cd build
-%cmake \
-       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-       ../
-%{__make}
+%cmake -B build \
+       -G Ninja \
+       %{!?with_tests:-DBUILD_TESTING=OFF} \
+       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+
+%ninja_build -C build
+
+%if %{with tests}
+%ninja_build -C build test
+%endif
+
 
 %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
 
@@ -83,15 +94,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{kfname}5_qt.lang
 %defattr(644,root,root,755)
 %doc README.md
-%attr(755,root,root) %ghost %{_libdir}/libKF5WidgetsAddons.so.5
+%ghost %{_libdir}/libKF5WidgetsAddons.so.5
 %attr(755,root,root) %{_libdir}/libKF5WidgetsAddons.so.*.*
+%attr(755,root,root) %{_libdir}/qt5/plugins/designer/kwidgetsaddons5widgets.so
 %dir %{_datadir}/kf5/kcharselect
 %{_datadir}/kf5/kcharselect/kcharselect-data
+%{_datadir}/qlogging-categories5/kwidgetsaddons.categories
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/KF5/KWidgetsAddons
-%{_includedir}/KF5/kwidgetsaddons_version.h
 %{_libdir}/cmake/KF5WidgetsAddons
-%attr(755,root,root) %{_libdir}/libKF5WidgetsAddons.so
+%{_libdir}/libKF5WidgetsAddons.so
 %{qt5dir}/mkspecs/modules/qt_KWidgetsAddons.pri