X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kf5-kcoreaddons.spec;h=5ad10b2bba29f521918dd69feb94e5e049f67c8d;hb=6a97775fcf9dc9121204305a8b5cf970fc2896b7;hp=46e49d2a7bd5b5fae796db0dfef0987bf5695117;hpb=660a4795122384e2bdd1c281dcfb1a3c361dc5e2;p=packages%2Fkf5-kcoreaddons.git

diff --git a/kf5-kcoreaddons.spec b/kf5-kcoreaddons.spec
index 46e49d2..5ad10b2 100644
--- a/kf5-kcoreaddons.spec
+++ b/kf5-kcoreaddons.spec
@@ -5,30 +5,33 @@
 # TODO:
 # - runtime Requires if any
 
-%define		kdeframever	5.56
-%define		qtver		5.9.0
+%define		kdeframever	5.115
+%define		qtver		5.15.2
 %define		kfname		kcoreaddons
 Summary:	Utilities for core application functionality and accessing the OS
 Name:		kf5-%{kfname}
-Version:	5.56.0
+Version:	5.115.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:	61056e358e4a90e15023573bf73bbbfc
+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 >= %{qtver}
+%if %{with tests}
 BuildRequires:	Qt5Test-devel >= %{qtver}
-BuildRequires:	cmake >= 2.8.12
-BuildRequires:	fam-devel
-BuildRequires:	kf5-extra-cmake-modules >= 1.4.0
+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.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)
 
@@ -45,7 +48,7 @@ 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 >= 2.6.0
+Requires:	cmake >= 3.16
 
 %description devel
 Header files for %{kfname} development.
@@ -58,19 +61,23 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 #%patch0 -p1
 
 %build
-install -d build
-cd build
-%cmake -G Ninja \
-	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-	../
-%ninja_build
+%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:%ninja_build test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %ninja_install -C build
 
+# not supported by glibc yet
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{ie,tok}
+
 %find_lang %{kfname}5_qt --with-qm --all-name --with-kde
 
 %clean
@@ -84,8 +91,11 @@ 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
-/etc/xdg/kcoreaddons.categories
+%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
@@ -95,12 +105,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_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