- updated to 5.86.0

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

diff --git a/kf5-kcoreaddons.spec b/kf5-kcoreaddons.spec
index 06b43fdaa7d7b5dff3db83977eb9dc13bec473e2..f4f1866666cd322be0673408e5ea9041052f7310 100644 (file)
--- a/kf5-kcoreaddons.spec
+++ b/kf5-kcoreaddons.spec
@@ -1,33 +1,39 @@
 #
 # Conditional build:
-%bcond_without tests           # build without tests
+%bcond_with    tests           # build with tests
 
 # TODO:
 # - runtime Requires if any
-# - dir /usr/include/KF5 not packaged
 
-%define                kdeframever     5.4
-%define                qtver           5.3.2
+%define                kdeframever     5.86
+%define                qtver           5.14.0
 %define                kfname          kcoreaddons
 Summary:       Utilities for core application functionality and accessing the OS
 Name:          kf5-%{kfname}
-Version:       5.4.0
+Version:       5.86.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: 4946f5145126de7bf293c3140194e966
+Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5: 1dd18515d8a807ca1e04c953be150dc0
+Patch0:                flaky-tests.patch
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
+%if %{with tests}
 BuildRequires: Qt5Test-devel >= %{qtver}
-BuildRequires: cmake >= 2.8.12
+BuildRequires: Qt5Widgets-devel >= %{qtver}
+%endif
+BuildRequires: cmake >= 3.5
 BuildRequires: fam-devel
-BuildRequires: kf5-extra-cmake-modules >= 1.4.0
+BuildRequires: kf5-extra-cmake-modules >= %{version}
+BuildRequires: ninja
 BuildRequires: qt5-linguist >= %{qtver}
-BuildRequires: rpmbuild(macros) >= 1.164
-BuildRequires: shared-mime-info
+BuildRequires: rpmbuild(macros) >= 1.736
+BuildRequires: shared-mime-info >= 1.3
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+Requires:      Qt5Core >= %{qtver}
+Requires:      kf5-dirs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,6 +48,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:      Qt5Core >= %{qtver}
+Requires:      cmake >= 3.5
 
 %description devel
 Header files for %{kfname} development.
@@ -51,24 +59,23 @@ 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 \
+%cmake -G Ninja \
        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-       -DBIN_INSTALL_DIR=%{_bindir} \
        ../
-%{__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
 
-%find_lang %{kfname}5_qt --with-qm
+%find_lang %{kfname}5_qt --with-qm --all-name --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,7 +88,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.md
 %{_datadir}/mime/packages/kde5.xml
 %attr(755,root,root) %{_libdir}/libKF5CoreAddons.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libKF5CoreAddons.so.5
+%ghost %{_libdir}/libKF5CoreAddons.so.5
+%{_datadir}/qlogging-categories5/kcoreaddons.categories
+%dir %{_datadir}/kf5/licenses
+%{_datadir}/kf5/licenses/ARTISTIC
+%{_datadir}/kf5/licenses/BSD
+%{_datadir}/kf5/licenses/GPL_V2
+%{_datadir}/kf5/licenses/GPL_V3
+%{_datadir}/kf5/licenses/LGPL_V2
+%{_datadir}/kf5/licenses/LGPL_V21
+%{_datadir}/kf5/licenses/LGPL_V3
+%{_datadir}/kf5/licenses/QPL_V1.0
+%{_datadir}/qlogging-categories5/kcoreaddons.renamecategories
 
 %files devel
 %defattr(644,root,root,755)
@@ -89,5 +107,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/KF5/KCoreAddons
 %{_includedir}/KF5/kcoreaddons_version.h
 %{_libdir}/cmake/KF5CoreAddons
-%attr(755,root,root) %{_libdir}/libKF5CoreAddons.so
+%{_libdir}/libKF5CoreAddons.so
 %{_libdir}/qt5/mkspecs/modules/qt_KCoreAddons.pri