From 9d22008c22572312d8317a93c5c5ffcc9a76855c Mon Sep 17 00:00:00 2001 From: ChenYanpan Date: Mon, 18 Nov 2024 20:24:09 +0800 Subject: [PATCH] adapt to the new CMake macros to fix build failure --- kf5-kconfig.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kf5-kconfig.spec b/kf5-kconfig.spec index 858b171..a7171f7 100644 --- a/kf5-kconfig.spec +++ b/kf5-kconfig.spec @@ -25,7 +25,7 @@ Name: kf5-%{framework} Version: 5.113.0 -Release: 1 +Release: 2 Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system License: GPLv2+ and LGPLv2+ and MIT @@ -149,9 +149,7 @@ PYTHONPATH=%{_datadir}/ECM/python export PYTHONPATH %endif -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. \ +%{cmake_kf5} \ %if 0%{?flatpak} %{?docs:-DBUILD_QCH:BOOL=OFF} \ %else @@ -159,12 +157,11 @@ pushd %{_target_platform} %endif %{?ninja:-G Ninja} \ %{?tests:-DBUILD_TESTING:BOOL=ON} -popd %if 0%{?ninja} %ninja_build -C %{_target_platform} %else -%make_build -C %{_target_platform} +%{cmake_build} %endif @@ -172,7 +169,7 @@ popd %if 0%{?ninja} %ninja_install -C %{_target_platform} %else -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%{cmake_install} %endif %find_lang_kf5 kconfig5_qt @@ -186,7 +183,7 @@ xvfb-run -a \ %if 0%{?ninja} ninja test %{?_smp_mflags} -v -C redhat-linux-build ||: %else -make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --timeout 300" ||: +%{ctest} %endif %endif @@ -242,6 +239,9 @@ make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --time %changelog +* Mon Nov 18 2024 ChenYanpan - 5.113.0-2 +- adapt to the new CMake macros to fix build failure + * Wed Jan 03 2024 wangqia - 5.113.0-1 - Update to upstream version 5.113.0 @@ -264,7 +264,7 @@ make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --time - update to upstream version 5.88.0 * Wed Jul 07 2021 tanyulong -5.55.0-2 -- fix kf5-kconfig project +- fix kf5-kconfig project * Thu Jul 23 2020 wangmian - 5.55.0-1 - Init kf5-kconfig project