!11 fixed kf5-akonadi-server build failure in openEuler-24.03-LTS-SP1:epol

From: @chenyanpanX Reviewed-by: @misaka00251 Signed-off-by: @misaka00251
adapt to the new CMake macros to fix build failure
2024-11-19 07:16:55 +00:00 · 2024-11-18 17:58:28 +08:00 · 2024-01-15 03:49:41 +00:00 · 2024-01-15 11:01:56 +08:00 · 2023-08-09 06:20:50 +00:00 · 2023-08-04 11:38:43 +08:00
3 changed files with 67 additions and 60 deletions
--- a/akonadi-22.08.0.tar.xz
+++ b/akonadi-22.08.0.tar.xz
--- a/akonadi-23.08.4.tar.xz
+++ b/akonadi-23.08.4.tar.xz
--- a/kf5-akonadi-server.spec
+++ b/kf5-akonadi-server.spec
@ -1,41 +1,32 @@
-
 %global framework akonadi-server
+%global mysql mariadb

-%global mysql mysql
-
-# bootstrap mode
-%global bootstrap 1
-
+# uncomment to enable bootstrap mode
+# global bootstrap 1
 %if !0%{?bootstrap}
 # skip slow(er) archs
-%ifnarch %{arm} riscv64
+%ifnarch %{arm} s390x riscv64
 %global tests 0
 %endif
 %endif

 Name:           kf5-%{framework}
 Summary:        PIM Storage Service
-Version:        22.08.0
-Release:        1
+Version:        23.08.4
+Release:        2
 License:        LGPLv2+
 URL:            https://invent.kde.org/frameworks/%{framework}
-
-%global revision %(echo %{version} | cut -d. -f3)
-%if %{revision} >= 50
-%global stable unstable
-%else
-%global stable stable
-%endif
 Source0:        http://download.kde.org/%{stable}/release-service/%{version}/src/akonadi-%{version}.tar.xz
 Source10:       akonadiserverrc.mysql
 Source11:       akonadiserverrc.sqlite

 %define mysql_conf_timestamp 20170512
+%global majmin %majmin_ver_kf5
+%global stable %stable_kf5

 BuildRequires:  extra-cmake-modules >= 5.60
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  qt5-qtbase-devel
-BuildRequires:  qt5-qttools-devel
 BuildRequires:  qt5-qtxmlpatterns-devel

 BuildRequires:  cmake(KF5ItemViews)
@ -59,26 +50,21 @@ BuildRequires:  iptables-libs

 %global majmin_ver %(echo %{version} | cut -d. -f1,2)

-## optional deps
 %if ! 0%{?bootstrap}
 BuildRequires:  pkgconfig(Qt5Designer)
 BuildRequires:  cmake(KF5DesignerPlugin)
-BuildRequires:  cmake(AccountsQt5)
+BuildRequires:  libaccounts-qt5-devel
 BuildRequires:  cmake(KAccounts)
 BuildRequires:  kaccounts-integration-devel
 %endif

 # sqlite3 driver plugin needs versioned qt5 dep
 BuildRequires:  qt5-qtbase-private-devel
-%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-
-# backends
-# In the future use cmake(xxx) instead of these
-BuildRequires:  mariadb-server
-BuildRequires:  postgresql-server
+%{?_qt5:Requires: %{_qt5} = %{_qt5_version}}

 %if 0%{?tests}
 BuildRequires:  dbus-x11
+BuildRequires:  mariadb-server
 BuildRequires:  xorg-x11-server-Xvfb
 %endif

@ -88,8 +74,13 @@ Requires(postun): %{_sbindir}/update-alternatives
 Recommends:     %{name}-mysql = %{version}-%{release}

 Conflicts:      akonadi < 1.13.0-100
+
+# translations moved here
 Conflicts:      kde-l10n < 17.03

+# when kf5-akonadi was split, -socialutils was dropped
+Obsoletes:      kf5-akonadi-socialutils < 16.07
+
 %description
 %{summary}.

@ -97,7 +88,7 @@ Conflicts:      kde-l10n < 17.03
 Summary:        Developer files for %{name}
 Obsoletes:      kf5-akonadi-devel < 16.03
 Obsoletes:      kf5-akonadi-socialutils-devel < 16.07
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       boost-devel
 Requires:       kf5-kcompletion-devel
 Requires:       kf5-kjobwidgets-devel
@ -107,7 +98,6 @@ Requires:       kf5-kxmlgui-devel
 Requires:       kf5-kitemmodels-devel
 Requires:       qt5-qtbase-devel
 Conflicts:      akonadi-devel
-
 %description devel
 %{summary}.

@ -116,15 +106,14 @@ Summary:        Akonadi MySQL backend support
 Obsoletes:      akonadi < 1.7.90-2
 Obsoletes:      akonadi-mysql < 15.08.0
 Provides:       akonadi-mysql = %{version}-%{release}
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 Requires:       %{mysql}-server
 %if "%{?mysql}" != "mariadb"
 Recommends:     mariadb-server
 %endif
-Requires:       qt5-qtbase-mysql%{?_isa}
+Requires:       qt5-qtbase-mysql
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
-
 %description mysql
 Configures akonadi to use mysql backend by default.

@ -137,20 +126,20 @@ See also: %{_sysconfdir}/akonadi/mysql-global.conf
 %prep
 %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
-popd
-%make_build  -C %{_target_platform}
+  -DINSTALL_APPARMOR:BOOL=OFF \
+  -DMYSQLD_EXECUTABLE:FILEPATH=%{_libexecdir}/mysqld \
+  -DMYSQLD_SCRIPTS_PATH:FILEPATH=%{_bindir}/mysql_install_db \
+  -DPOSTGRES_PATH:FILEPATH=%{_bindir}/pg_ctl
+
+%{cmake_build}


 %install
-make install/fast DESTDIR=%{buildroot}  -C %{_target_platform}
+%{cmake_install}

 %find_lang libakonadi5
 %find_lang akonadi_knut_resource
@ -165,18 +154,20 @@ touch -d %{mysql_conf_timestamp} \
  %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-global*.conf \
  %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-local.conf

+# create/own these dirs
 mkdir -p %{buildroot}%{_kf5_datadir}/akonadi/plugins
 mkdir -p %{buildroot}%{_kf5_libdir}/akonadi

+# %%ghost'd global akonadiserverrc
 touch akonadiserverrc
 install -p -m644 -D akonadiserverrc %{buildroot}%{_sysconfdir}/xdg/akonadi/akonadiserverrc

+## unpackaged files
 # omit mysql-global-mobile.conf
 rm -fv %{buildroot}%{_sysconfdir}/xdg/akonadi/mysql-global-mobile.conf
-# part of omitting exceptions header hack, drop the custom header
+# part of omitting exceptions header hack, drop the custom (no-longer-used) header itself
 rm -fv %{buildroot}%{_kf5_includedir}/AkonadiCore/std_exception.h

-
 %check
 %if 0%{?tests}
 export CTEST_OUTPUT_ON_FAILURE=1
@ -185,7 +176,6 @@ dbus-launch --exit-with-session \
 make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 %endif

-
 %post
 %{?ldconfig}
 %{_sbindir}/update-alternatives \
@ -202,7 +192,6 @@ if [ $1 -eq 0 ] ; then
  %{_sysconfdir}/xdg/akonadi/akonadiserverrc.sqlite
 fi

-
 %files -f libakonadi5.lang
 %doc AUTHORS
 %doc README*
@ -223,13 +212,13 @@ fi
 %{_kf5_datadir}/akonadi/
 %{_kf5_datadir}/config.kcfg/resourcebase.kcfg
 %{_kf5_datadir}/kf5/akonadi/
-%{_kf5_qtplugindir}/designer/akonadiwidgets.so
-%{_kf5_qtplugindir}/sqldrivers/libqsqlite3.so
-%{_kf5_libdir}/libKF5AkonadiAgentBase.so.5*
-%{_kf5_libdir}/libKF5AkonadiCore.so.5*
-%{_kf5_libdir}/libKF5AkonadiPrivate.so.5*
-%{_kf5_libdir}/libKF5AkonadiWidgets.so.5*
-%{_kf5_libdir}/libKF5AkonadiXml.so.5*
+%{_kf5_qtplugindir}/designer/akonadi5widgets.so
+%{_kf5_qtplugindir}/designer/akonadi5widgets.so
+%{_kf5_libdir}/libKPim5AkonadiAgentBase.so.5*
+%{_kf5_libdir}/libKPim5AkonadiCore.so.5*
+%{_kf5_libdir}/libKPim5AkonadiPrivate.so.5*
+%{_kf5_libdir}/libKPim5AkonadiWidgets.so.5*
+%{_kf5_libdir}/libKPim5AkonadiXml.so.5*
 %{_kf5_datadir}/icons/hicolor/*/apps/akonadi.*
 %{_kf5_bindir}/akonadi_knut_resource
 %{_kf5_datadir}/kf5/akonadi_knut_resource/
@ -240,19 +229,22 @@ fi
 %{_kf5_bindir}/akonaditest
 %{_kf5_bindir}/asapcat
 %{_kf5_datadir}/dbus-1/interfaces/org.freedesktop.Akonadi.*.xml
-%{_kf5_includedir}/Akonadi/
-%{_kf5_includedir}/AkonadiAgentBase/
-%{_kf5_includedir}/AkonadiCore/
-%{_kf5_includedir}/AkonadiWidgets/
-%{_kf5_includedir}/AkonadiXml/
-%{_kf5_libdir}/libKF5AkonadiAgentBase.so
-%{_kf5_libdir}/libKF5AkonadiCore.so
-%{_kf5_libdir}/libKF5AkonadiPrivate.so
-%{_kf5_libdir}/libKF5AkonadiWidgets.so
-%{_kf5_libdir}/libKF5AkonadiXml.so
+%{_includedir}/KPim5/Akonadi/
+%{_includedir}/KPim5/AkonadiAgentBase/
+%{_includedir}/KPim5/AkonadiCore/
+%{_includedir}/KPim5/AkonadiWidgets/
+%{_includedir}/KPim5/AkonadiXml/
+%{_kf5_libdir}/libKPim5AkonadiAgentBase.so
+%{_kf5_libdir}/libKPim5AkonadiCore.so
+%{_kf5_libdir}/libKPim5AkonadiPrivate.so
+%{_kf5_libdir}/libKPim5AkonadiWidgets.so
+%{_kf5_libdir}/libKPim5AkonadiXml.so
 %{_kf5_libdir}/cmake/KF5Akonadi/
+%{_kf5_libdir}/cmake/KPim5Akonadi/
 %{_kf5_archdatadir}/mkspecs/modules/qt_Akonadi*.pri
 %{_kf5_qtplugindir}/pim5/akonadi/akonadi_test_searchplugin.so
+%{_kf5_datadir}/kdevappwizard/templates/akonadiresource.tar.bz2
+%{_kf5_datadir}/kdevappwizard/templates/akonadiserializer.tar.bz2

 %post mysql
 %{_sbindir}/update-alternatives \
@ -273,7 +265,22 @@ fi
 %config(noreplace) %{_sysconfdir}/xdg/akonadi/mysql-global.conf
 %config(noreplace) %{_sysconfdir}/xdg/akonadi/mysql-local.conf

-
 %changelog
+* Mon Nov 18 2024 ChenYanpan <chenyanpan@xfusion.com> - 23.08.4-2
+- adapt to the new CMake macros to fix build failure
+
+* Mon Jan 15 2024 misaka00251 <liuxin@iscas.ac.cn> - 23.08.4-1
+- Upgrade to 23.08.4
+- Skip riscv64 tests
+
+* Fri Aug 04 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 23.04.3-1
+- Update package to version 23.04.3
+
+* Wed Apr 26 2023 peijiankang <peijiankang@kylinos.cn> - 22.12.0-2
+- mv mysql to mariadb
+
+* Mon Apr 24 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 22.12.0-1
+- Update package to version 22.12.0
+
 * Wed Jul 27 2022 misaka00251 <misaka00251@misakanet.cn> - 22.08.0-1
 - Init package
Author	SHA1	Message	Date
openeuler-ci-bot	0439cd578a	!11 fixed kf5-akonadi-server build failure in openEuler-24.03-LTS-SP1:epol From: @chenyanpanX Reviewed-by: @misaka00251 Signed-off-by: @misaka00251	2024-11-19 07:16:55 +00:00
ChenYanpan	ad774244d2	adapt to the new CMake macros to fix build failure	2024-11-18 17:58:28 +08:00
openeuler-ci-bot	1095eb20de	!6 Upgrade to 23.08.4 From: @misaka00251 Reviewed-by: @peijiankang Signed-off-by: @peijiankang	2024-01-15 03:49:41 +00:00
misaka00251	9d169fa3a9	Upgrade to 23.08.4	2024-01-15 11:01:56 +08:00
openeuler-ci-bot	2fe4c0f114	!5 Update package to version 23.04.3 From: @jxy_git Reviewed-by: @peijiankang Signed-off-by: @peijiankang	2023-08-09 06:20:50 +00:00
jxy_git	c1ec196568	Update package to version 23.04.3	2023-08-04 11:38:43 +08:00
openeuler-ci-bot	295b350e74	!3 mv mysql to mariadb From: @peijiankang Reviewed-by: @dou33 Signed-off-by: @dou33	2023-04-27 01:06:01 +00:00
peijiankang	ea193b57f9	mv mysql to mariadb	2023-04-26 17:08:24 +08:00
openeuler-ci-bot	2c71209828	!2 Update package to version 22.12.0 From: @jxy_git Reviewed-by: @peijiankang Signed-off-by: @peijiankang	2023-04-25 05:34:33 +00:00
jxy_git	f59a28ab86	Update package to version 22.12.0	2023-04-25 10:05:18 +08:00