adapt to the new CMake macros to fix build failure

This commit is contained in:
ChenYanpan 2024-11-18 20:24:09 +08:00
parent 8efcd90cf7
commit 9d22008c22
No known key found for this signature in database
GPG Key ID: 743990DD9697055F

View File

@ -25,7 +25,7 @@
Name: kf5-%{framework} Name: kf5-%{framework}
Version: 5.113.0 Version: 5.113.0
Release: 1 Release: 2
Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system Summary: KDE Frameworks 5 Tier 1 addon with advanced configuration system
License: GPLv2+ and LGPLv2+ and MIT License: GPLv2+ and LGPLv2+ and MIT
@ -149,9 +149,7 @@ PYTHONPATH=%{_datadir}/ECM/python
export PYTHONPATH export PYTHONPATH
%endif %endif
mkdir %{_target_platform} %{cmake_kf5} \
pushd %{_target_platform}
%{cmake_kf5} .. \
%if 0%{?flatpak} %if 0%{?flatpak}
%{?docs:-DBUILD_QCH:BOOL=OFF} \ %{?docs:-DBUILD_QCH:BOOL=OFF} \
%else %else
@ -159,12 +157,11 @@ pushd %{_target_platform}
%endif %endif
%{?ninja:-G Ninja} \ %{?ninja:-G Ninja} \
%{?tests:-DBUILD_TESTING:BOOL=ON} %{?tests:-DBUILD_TESTING:BOOL=ON}
popd
%if 0%{?ninja} %if 0%{?ninja}
%ninja_build -C %{_target_platform} %ninja_build -C %{_target_platform}
%else %else
%make_build -C %{_target_platform} %{cmake_build}
%endif %endif
@ -172,7 +169,7 @@ popd
%if 0%{?ninja} %if 0%{?ninja}
%ninja_install -C %{_target_platform} %ninja_install -C %{_target_platform}
%else %else
make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{cmake_install}
%endif %endif
%find_lang_kf5 kconfig5_qt %find_lang_kf5 kconfig5_qt
@ -186,7 +183,7 @@ xvfb-run -a \
%if 0%{?ninja} %if 0%{?ninja}
ninja test %{?_smp_mflags} -v -C redhat-linux-build ||: ninja test %{?_smp_mflags} -v -C redhat-linux-build ||:
%else %else
make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --timeout 300" ||: %{ctest}
%endif %endif
%endif %endif
@ -242,6 +239,9 @@ make test %{?_smp_mflags} -C redhat-linux-build ARGS="--output-on-failure --time
%changelog %changelog
* Mon Nov 18 2024 ChenYanpan <chenyanpan@xfusion.com> - 5.113.0-2
- adapt to the new CMake macros to fix build failure
* Wed Jan 03 2024 wangqia <wangqia@uniontech.com> - 5.113.0-1 * Wed Jan 03 2024 wangqia <wangqia@uniontech.com> - 5.113.0-1
- Update to upstream version 5.113.0 - Update to upstream version 5.113.0