From 1e48bf672cc2cfd2232aa8304adc28e89fbe4873 Mon Sep 17 00:00:00 2001
From: tangjie02 <tangjie02@kylinsec.com.cn>
Date: Wed, 20 Nov 2024 10:19:01 +0800
Subject: [PATCH] feature(spec): adapt to the new CMake macros to fix build
 failure and remove fedora marco

Signed-off-by: tangjie02 <tangjie02@kylinsec.com.cn>
---
 kf5-kwayland.spec | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/kf5-kwayland.spec b/kf5-kwayland.spec
index 980b2be..0a9bc47 100644
--- a/kf5-kwayland.spec
+++ b/kf5-kwayland.spec
@@ -5,14 +5,12 @@
 #global bootstrap 1
 ## currently includes no tests
 %if !0%{?bootstrap}
-%if 0%{?fedora}
-%global tests 1
-%endif
+%global tests 0
 %endif
 
 Name:           kf5-%{framework}
 Version:        5.115.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,24 +63,17 @@ developing applications that use %{name}.
 %autosetup -n %{framework}-%{version} -p1
 
 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kf5} .. \
+%{cmake_kf5} \
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
-popd
 
-%make_build -C %{_target_platform}
+%cmake_build
 
 %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} ||:
+%{ctest}
 %endif
 
 %ldconfig_scriptlets
@@ -105,6 +96,9 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:
 %{_kf5_archdatadir}/mkspecs/modules/qt_KWaylandServer.pri
 
 %changelog
+* Wed Nov 20 2024 tangjie02 <tangjie02@kylinsec.com.cn> - 5.115.0-2
+- adapt to the new CMake macros to fix build failure
+
 * Fri Mar 01 2024 maqi <maqi@uniontech.com> - 5.115.0-1
 - Update package to version 5.115.0
 
-- 
Gitee