From 126528f02b33a5b8dd5103e0d7fddc51f4574bd8 Mon Sep 17 00:00:00 2001 From: ChenYanpan Date: Fri, 15 Nov 2024 19:43:49 +0800 Subject: [PATCH] adapt to the new CMake macros to fix build failure --- kf5-kwayland.spec | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/kf5-kwayland.spec b/kf5-kwayland.spec index de4194d..9146738 100644 --- a/kf5-kwayland.spec +++ b/kf5-kwayland.spec @@ -12,7 +12,7 @@ Name: kf5-%{framework} Version: 5.113.0 -Release: 1 +Release: 2 Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries License: GPL-2.0-or-later URL: https://invent.kde.org/frameworks/%{framework} @@ -65,25 +65,15 @@ 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} %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 20" -C %{_target_platform} ||: -%endif +%{ctest} %ldconfig_scriptlets @@ -105,6 +95,9 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: %{_kf5_archdatadir}/mkspecs/modules/qt_KWaylandServer.pri %changelog +* Fri Nov 15 2024 ChenYanpan - 5.113.0-2 +- adapt to the new CMake macros to fix build failure + * Mon Jan 08 2024 zhangxianting - 5.113.0-1 - update to upstream version 5.113.0 -- Gitee