From ad774244d2cbd753f426f5c1345dcf0515018952 Mon Sep 17 00:00:00 2001 From: ChenYanpan Date: Mon, 18 Nov 2024 17:58:28 +0800 Subject: [PATCH] adapt to the new CMake macros to fix build failure --- kf5-akonadi-server.spec | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/kf5-akonadi-server.spec b/kf5-akonadi-server.spec index cfa4a6f..c1f0b52 100644 --- a/kf5-akonadi-server.spec +++ b/kf5-akonadi-server.spec @@ -13,7 +13,7 @@ Name: kf5-%{framework} Summary: PIM Storage Service Version: 23.08.4 -Release: 1 +Release: 2 License: LGPLv2+ URL: https://invent.kde.org/frameworks/%{framework} Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/akonadi-%{version}.tar.xz @@ -127,20 +127,19 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf %autosetup -n akonadi-%{version} -p1 %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. \ +%{cmake_kf5} \ %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \ -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \ -DINSTALL_APPARMOR:BOOL=OFF \ -DMYSQLD_EXECUTABLE:FILEPATH=%{_libexecdir}/mysqld \ -DMYSQLD_SCRIPTS_PATH:FILEPATH=%{_bindir}/mysql_install_db \ -DPOSTGRES_PATH:FILEPATH=%{_bindir}/pg_ctl -popd -%make_build -C %{_target_platform} + +%{cmake_build} + %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%{cmake_install} %find_lang libakonadi5 %find_lang akonadi_knut_resource @@ -267,6 +266,9 @@ fi %config(noreplace) %{_sysconfdir}/xdg/akonadi/mysql-local.conf %changelog +* Mon Nov 18 2024 ChenYanpan - 23.08.4-2 +- adapt to the new CMake macros to fix build failure + * Mon Jan 15 2024 misaka00251 - 23.08.4-1 - Upgrade to 23.08.4 - Skip riscv64 tests