From 3af8a871d1bc980a494e05b28636ee3de9c27338 Mon Sep 17 00:00:00 2001 From: ChenYanpan Date: Fri, 15 Nov 2024 19:39:53 +0800 Subject: [PATCH] adapt to the new CMake macros to fix build failure --- kf5-kholidays.spec | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/kf5-kholidays.spec b/kf5-kholidays.spec index dab4500..6e5c212 100644 --- a/kf5-kholidays.spec +++ b/kf5-kholidays.spec @@ -11,7 +11,7 @@ Name: kf5-%{framework} Epoch: 1 Version: 5.113.0 -Release: 1 +Release: 2 Summary: The KHolidays Library License: LGPLv2+ and GPLv3+ URL: https://invent.kde.org/frameworks/%{framework} @@ -48,28 +48,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_kf5 libkholidays5_qt %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 @@ -88,6 +78,9 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: %changelog +* Sun Nov 17 2024 ChenYanpan - 1:5.113.0-2 +- adapt to the new CMake macros to fix build failure + * Wed Jan 03 2024 jiangxinyu - 1:5.113.0-1 - Update package to version 5.113.0