From ee7a2118e957439b4e6860a912c4a8a91c1f1b1a Mon Sep 17 00:00:00 2001 From: ChenYanpan Date: Fri, 15 Nov 2024 19:39:35 +0800 Subject: [PATCH] adapt to the new CMake macros to fix build failure --- kf5-kdelibs4support.spec | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/kf5-kdelibs4support.spec b/kf5-kdelibs4support.spec index 21ac4a3..bc64401 100644 --- a/kf5-kdelibs4support.spec +++ b/kf5-kdelibs4support.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.113.0 -Release: 1 +Release: 2 Summary: KDE Frameworks 5 Tier 4 module with porting aid from KDELibs 4 License: GPLv2+ and LGPLv2+ and BSD URL: https://invent.kde.org/frameworks/%{framework} @@ -108,19 +108,12 @@ developing applications that use %{name}. %autosetup -n %{framework}-%{version} -p1 %build -mkdir %{_target_platform} -pushd %{_target_platform} -# Set absolute BIN_INSTALL_DIR, otherwise CMake will complain about mixed use of -# absolute and relative paths for some reason -# Remove once fixed upstream -%{cmake_kf5} .. \ - -DBIN_INSTALL_DIR=%{_kf5_bindir} -popd +%{cmake_kf5} +%{cmake_build} -%make_build -C %{_target_platform} %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%{cmake_install} %find_lang all --all-name --with-man %{?_with_html} @@ -185,6 +178,9 @@ rm -fv %{buildroot}%{_kf5_sysconfdir}/xdg/kdebugrc %changelog +* Fri Nov 15 2024 ChenYanpan - 5.113.0-2 +- adapt to the new CMake macros to fix build failure + * Mon Jan 08 2024 wangqia - 5.113.0-1 - Update to upstream version 5.113.0 @@ -208,4 +204,3 @@ rm -fv %{buildroot}%{_kf5_sysconfdir}/xdg/kdebugrc * Mon Aug 17 2020 yeqinglong - 5.55.0-1 - Initial release for OpenEuler -