diff --git a/akonadi-22.12.0.tar.xz b/akonadi-22.12.0.tar.xz deleted file mode 100644 index fbfc0fd..0000000 Binary files a/akonadi-22.12.0.tar.xz and /dev/null differ diff --git a/akonadi-23.04.3.tar.xz b/akonadi-23.04.3.tar.xz new file mode 100644 index 0000000..ca2c2c0 Binary files /dev/null and b/akonadi-23.04.3.tar.xz differ diff --git a/kf5-akonadi-server.spec b/kf5-akonadi-server.spec index 9ec95b5..d53e711 100644 --- a/kf5-akonadi-server.spec +++ b/kf5-akonadi-server.spec @@ -12,8 +12,8 @@ Name: kf5-%{framework} Summary: PIM Storage Service -Version: 22.12.0 -Release: 2 +Version: 23.04.3 +Release: 1 License: LGPLv2+ URL: https://invent.kde.org/frameworks/%{framework} Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/akonadi-%{version}.tar.xz @@ -21,12 +21,8 @@ Source10: akonadiserverrc.mysql Source11: akonadiserverrc.sqlite %define mysql_conf_timestamp 20170512 -%global revision %(echo %{version} | cut -d. -f3) -%if %{revision} >= 50 -%global stable unstable -%else -%global stable stable -%endif +%global majmin %majmin_ver_kf5 +%global stable %stable_kf5 BuildRequires: extra-cmake-modules >= 5.60 BuildRequires: kf5-rpm-macros @@ -218,13 +214,14 @@ fi %{_kf5_datadir}/akonadi/ %{_kf5_datadir}/config.kcfg/resourcebase.kcfg %{_kf5_datadir}/kf5/akonadi/ -%{_kf5_qtplugindir}/designer/akonadiwidgets.so +%{_kf5_qtplugindir}/designer/akonadi5widgets.so +%{_kf5_qtplugindir}/designer/akonadi5widgets.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_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/ @@ -235,17 +232,18 @@ 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 @@ -271,6 +269,9 @@ fi %config(noreplace) %{_sysconfdir}/xdg/akonadi/mysql-local.conf %changelog +* Fri Aug 04 2023 jiangxinyu - 23.04.3-1 +- Update package to version 23.04.3 + * Wed Apr 26 2023 peijiankang - 22.12.0-2 - mv mysql to mariadb