- updated to 5.115.0

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

diff --git a/kf5-kcoreaddons.spec b/kf5-kcoreaddons.spec
index c7188c77e43f7e61cb583d41412e50850927531e..5ad10b2bba29f521918dd69feb94e5e049f67c8d 100644 (file)
--- a/kf5-kcoreaddons.spec
+++ b/kf5-kcoreaddons.spec
@@ -1,32 +1,38 @@
+#
+# Conditional build:
+%bcond_with    tests           # build with tests
+
 # TODO:
 # - runtime Requires if any
-# - dir /usr/include/KF5 not packaged
-
-%bcond_without tests
-
-%define                orgname         kcoreaddons
-%define                kdeframever     5.4
-%define                qt_ver          5.3.2
 
+%define                kdeframever     5.115
+%define                qtver           5.15.2
+%define                kfname          kcoreaddons
 Summary:       Utilities for core application functionality and accessing the OS
-Name:          kf5-%{orgname}
-Version:       5.4.0
+Name:          kf5-%{kfname}
+Version:       5.115.0
 Release:       1
 License:       GPL v2+/LGPL v2.1+
 Group:         X11/Libraries
-Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{orgname}-%{version}.tar.xz
-# Source0-md5: 4946f5145126de7bf293c3140194e966
+Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5: 159559a9fcc0812b4145acdd073a73d7
+Patch0:                flaky-tests.patch
 URL:           http://www.kde.org/
-BuildRequires: Qt5Core-devel >= %{qt_ver}
-BuildRequires: Qt5Test-devel >= %{qt_ver}
-BuildRequires: cmake >= 2.8.12
-BuildRequires: fam-devel
-BuildRequires: kf5-extra-cmake-modules >= 1.4.0
-BuildRequires: qt5-linguist >= %{qt_ver}
-BuildRequires: rpmbuild(macros) >= 1.164
-BuildRequires: shared-mime-info
+BuildRequires: Qt5Core-devel >= %{qtver}
+%if %{with tests}
+BuildRequires: Qt5Test-devel >= %{qtver}
+BuildRequires: Qt5Widgets-devel >= %{qtver}
+%endif
+BuildRequires: cmake >= 3.16
+BuildRequires: kf5-extra-cmake-modules >= %{version}
+BuildRequires: ninja
+BuildRequires: qt5-linguist >= %{qtver}
+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
@@ -37,57 +43,74 @@ manipulations such as macro replacement, accessing user information
 and many more.
 
 %package devel
-Summary:       Header files for %{orgname} development
-Summary(pl.UTF-8):     Pliki nagłówkowe dla programistów używających %{orgname}
+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.16
 
 %description devel
-Header files for %{orgname} development.
+Header files for %{kfname} development.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe dla programistów używających %{orgname}.
+Pliki nagłówkowe dla programistów używających %{kfname}.
 
 %prep
-%setup -q -n %{orgname}-%{version}
+%setup -q -n %{kfname}-%{version}
+#%patch0 -p1
 
 %build
-install -d build
-cd build
-%cmake \
-       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-       -DBIN_INSTALL_DIR=%{_bindir} \
-       ../
-%{__make}
+%cmake -B build \
+       -G Ninja \
+       %{!?with_tests:-DBUILD_TESTING=OFF} \
+       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+
+%ninja_build -C build
+
+%{?with_tests:%ninja_build -C build test}
 
-%{?with_tests:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+%ninja_install -C build
 
-%{__make} -C build/ install \
-        DESTDIR=$RPM_BUILD_ROOT
+# not supported by glibc yet
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ie,tok}
 
-%find_lang %{orgname}5_qt --with-qm
+%find_lang %{kfname}5_qt --with-qm --all-name --with-kde
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
-%files -f %{orgname}5_qt.lang
+%files -f %{kfname}5_qt.lang
 %defattr(644,root,root,755)
 %doc README.md
 %{_datadir}/mime/packages/kde5.xml
-%attr(755,root,root) %ghost %{_libdir}/libKF5CoreAddons.so.5
 %attr(755,root,root) %{_libdir}/libKF5CoreAddons.so.*.*.*
+%ghost %{_libdir}/libKF5CoreAddons.so.5
+##%dir %{_libdir}/qt5/plugins/namespace
+##%attr(755,root,root) %{_libdir}/qt5/plugins/namespace/jsonplugin_cmake_macro.so
+##%attr(755,root,root) %{_libdir}/qt5/plugins/namespace/pluginwithoutmetadata.so
+%{_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)
 %attr(755,root,root) %{_bindir}/desktoptojson
 %{_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