From ec5772bc45c0bff6cf93fc23481cdb68c27cb1bf Mon Sep 17 00:00:00 2001 From: ChenYanpan Date: Fri, 15 Nov 2024 19:40:30 +0800 Subject: [PATCH] adapt to the new CMake macros to fix build failure --- kf5-kontactinterface.spec | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/kf5-kontactinterface.spec b/kf5-kontactinterface.spec index 299ee40..8c1080e 100644 --- a/kf5-kontactinterface.spec +++ b/kf5-kontactinterface.spec @@ -10,7 +10,7 @@ Name: kf5-%{framework} Version: 23.08.4 -Release: 1 +Release: 2 Summary: The Kontact Interface Library License: LGPLv2+ @@ -60,28 +60,18 @@ developing applications that use %{name}. %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. \ - -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} -popd -%make_build -C %{_target_platform} +%{cmake_kf5} +%{cmake_build} %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%{cmake_install} %find_lang %{name} --all-name --with-html %check -%if 0%{?tests} -export CTEST_OUTPUT_ON_FAILURE=1 -xvfb-run -a \ -dbus-launch --exit-with-session \ -time \ -make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: -%endif +%{ctest} %ldconfig_scriptlets @@ -99,6 +89,9 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: %changelog +* Fri Nov 15 2024 ChenYanpan - 23.08.4-2 +- adapt to the new CMake macros to fix build failure + * Mon Jan 08 2024 houhongxun - 23.08.4-1 - Upgrade to version 23.08.4 @@ -110,4 +103,3 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||: * Thu Jul 28 2022 misaka00251 - 22.08.0-1 - Init package - -- Gitee