From 0c444fefe04fbff82c2dc86791ceab0cb4197995 Mon Sep 17 00:00:00 2001 From: ChenYanpan Date: Fri, 15 Nov 2024 19:39:32 +0800 Subject: [PATCH] adapt to the new CMake macros to fix build failure --- kf5-kdeclarative.spec | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/kf5-kdeclarative.spec b/kf5-kdeclarative.spec index 6c7f1ac..9beddf6 100644 --- a/kf5-kdeclarative.spec +++ b/kf5-kdeclarative.spec @@ -9,7 +9,7 @@ Name: kf5-%{framework} Version: 5.113.0 -Release: 1 +Release: 2 Summary: KDE Frameworks 5 Tier 3 addon for Qt declarative License: LGPLv2+ @@ -70,29 +70,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 %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 --verbose" -C %{_target_platform} ||: -%endif +%{ctest} %ldconfig_scriptlets @@ -129,6 +118,9 @@ make test ARGS="--output-on-failure --timeout 10 --verbose" -C %{_target_platfor %changelog +* Fri Nov 15 2024 ChenYanpan - 5.113.0-2 +- adapt to the new CMake macros to fix build failure + * Fri Jan 05 2024 wangqia - 5.113.0-1 - Update to upstream version 5.113.0 @@ -155,4 +147,3 @@ make test ARGS="--output-on-failure --timeout 10 --verbose" -C %{_target_platfor * Mon Aug 17 2020 yeqinglong - 5.55.0-1 - Initial release for OpenEuler -