From e2c3e5510679f5f62a623e0d7624b1e0cf6cbe96 Mon Sep 17 00:00:00 2001 From: ChenYanpan Date: Fri, 15 Nov 2024 19:40:32 +0800 Subject: [PATCH] adapt to the new CMake macros to fix build failure --- kf5-kpackage.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/kf5-kpackage.spec b/kf5-kpackage.spec index ad156f5..e457589 100644 --- a/kf5-kpackage.spec +++ b/kf5-kpackage.spec @@ -10,7 +10,7 @@ Name: kf5-%{framework} Version: 5.113.0 -Release: 1 +Release: 2 Summary: KDE Frameworks 5 Tier 2 library to load and install packages as plugins License: LGPLv2+ @@ -49,16 +49,12 @@ developing applications that use %{name}. %autosetup -n %{framework}-%{version} -p1 %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. \ - -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} -popd +%{cmake_kf5} +%{cmake_build} -%make_build -C %{_target_platform} %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%{cmake_install} %find_lang %{name} --all-name --with-man @@ -67,10 +63,8 @@ mkdir -p %{buildroot}%{_kf5_qtplugindir}/kpackage/packagestructure/ mkdir -p %{buildroot}%{_kf5_datadir}/kpackage/ %check -%if 0%{?tests} -export CTEST_OUTPUT_ON_FAILURE=1 -make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||: -%endif +%{ctest} + %ldconfig_scriptlets @@ -92,6 +86,9 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||: %changelog +* Fri Nov 15 2024 ChenYanpan - 5.113.0-2 +- adapt to the new CMake macros to fix build failure + * Mon Jan 08 2024 peijiankang - 5.113.0-1 - update verison to 5.113.0 -- Gitee