diff --git a/.files b/.files
index ed9f704..6e284f7 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index d226b5a..3c46c59 100644
--- a/.rev
+++ b/.rev
@@ -751,4 +751,12 @@
KDE Release Gear 22.12.3 (forwarded request 1068358 from krop)
1068725
+
+ f74ac56e561cf4a3e6418a2f2bf5edd1
+ 23.04.0
+
+ dimstar_suse
+ KDE Release Gear 23.04.0
+ 1082062
+
diff --git a/akonadi-calendar-22.12.3.tar.xz b/akonadi-calendar-22.12.3.tar.xz
deleted file mode 120000
index 81080aa..0000000
--- a/akonadi-calendar-22.12.3.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiheh7ap4wjgrm6uxstdpywozuhs2xt6jo7kgezty4nx2t2tm2o3yy
\ No newline at end of file
diff --git a/akonadi-calendar-22.12.3.tar.xz.sig b/akonadi-calendar-22.12.3.tar.xz.sig
deleted file mode 100644
index 5e548e0..0000000
--- a/akonadi-calendar-22.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmP9R+cACgkQu0YzUNbv
-Me9v6A//c2f7JhRHE70/L0fFgLdhxP2vu10yM/D1Dqm3rmrZywpM8O21WozUwDAs
-X1ts6ClnE88pE8Rt/uLRYgCgjd9Zw5u9G2+CYRjnulI5YANhAYBAu/BpWe+N6XkT
-r90xq3THE22lWMxfHyN82E5Op/U9k9M/ASLORUWQ0wpZ85teS87/P0p4Q9qeheH0
-I4rrbOmGL0DDPdZETLXyYs4NBordq9nsGsyhe1VW2Yc84QigrlDxF3p3sDumLr7k
-q1gFJpu1owFjfA1qwLV3Hi/88ig1lwHUtZgfDpotNSbT4uRdZjKKFg+eTS30DRJb
-PMFz75174P5CC7fOne8O5XcNdwGDuab2S6iGY9RY+DRM4q76SfmVz0FCssBzabLv
-hj7GQ3s5lNGWnlqfOFRTXTGZXrfS1SIpljMN0cY6ybYjjhf1VZ/X1DJeb0htZwYh
-UnQ9CpjUhX3TCWLHXTYs9jb5PhtgFhji6/clRJqqZ1Q2oFNwQwUg0mpSRvc897fJ
-absyHAQ9WLCC99rDL3g3t8cXqw8cSexooorbmNRGv036cOg04An/+fA/JESCPDlb
-hx5YfxcK/9vSfygpwh5kamIp9Lc+NFdXJv7nvxl+vOkVjn4es/YkY7aGADXzUk9R
-7Rl6YKuTMVU12bNUg+FKd/tHFXA018zXi9fBxalDlyAYpPGFgaU=
-=pgnJ
------END PGP SIGNATURE-----
diff --git a/akonadi-calendar-23.04.0.tar.xz b/akonadi-calendar-23.04.0.tar.xz
new file mode 120000
index 0000000..585b85b
--- /dev/null
+++ b/akonadi-calendar-23.04.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeidi6f3ag27kdfhd2qr3pple44h7jnpomkl3pa7zb5sn7kkdx5a3qi
\ No newline at end of file
diff --git a/akonadi-calendar-23.04.0.tar.xz.sig b/akonadi-calendar-23.04.0.tar.xz.sig
new file mode 100644
index 0000000..7c0134d
--- /dev/null
+++ b/akonadi-calendar-23.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmQ476AACgkQu0YzUNbv
+Me/SCg/+NfRN8LLgezwVWniWqRQqOqWPW77URiNeZBdESCR/rg22QOzJ6M8T2Ngd
+NgPV/FtyB+vk6grn5zX+qR5c/57lxEnrlJxp4QYFzrWPwj6esVhKVTnj6i4HU7qw
+4PNmKNPl5/NcJUNxivjEYTZpcOZHOCPDPdW/6clKSQvPM8dktAzhkK5KOjlThz1W
+ZYTZ4+gvbInRsWtebb0XqKtafCfE//TVxbcSNRT9ThGf6x5rEHO5Afi/BioUT3ew
+fcqkcpUwNpOjaZUa0vBp7gCB6Quk65M16373SUPb79QT9d2Od/i/0VZac2NtxxVz
+4srRrSVnTzT+bDaAyzpFevqMd8Vr5mpHPIqV5IAEMgIRSr1FXQD1FGycQ02cJYN8
+7PvcDADMKf+WW9yXfgICjnsF8z0BQqEfxtsUzxCVUsRYunlCXSXb+GdhG2Bohcxm
+UV9XJsYOWsVnBqmeduOKNqjcIc3TCpcX6h0xc6MmxQ80iqxWGcgHDWeQ8UJ7LhvN
+XvBGxQSeizRxMATAl/AIWRWixTG4aRUNoEn/zgNFH6lS51If1kY8DzqBPMk6H4Sw
+sAyFzMKiCM2eRxp65+hDnqjiFhKu0a9tHzq6nMHVT2nnnHu+sOKlmKnD4CW1JALV
+EcqQ8YinxdplPukEu1Y4IJ5e04awHSw4mP7VjOhhusn3cAvxvkk=
+=8Lew
+-----END PGP SIGNATURE-----
diff --git a/akonadi-calendar.changes b/akonadi-calendar.changes
index 13eb141..a60fd17 100644
--- a/akonadi-calendar.changes
+++ b/akonadi-calendar.changes
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Sat Apr 15 08:45:07 UTC 2023 - Christophe Marin
+
+- Update to 23.04.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/gear/23.04.0/
+
+-------------------------------------------------------------------
+Fri Mar 31 16:41:28 UTC 2023 - Christophe Marin
+
+- Update to 23.03.90
+ * New feature release
+
+-------------------------------------------------------------------
+Fri Mar 17 20:42:45 UTC 2023 - Christophe Marin
+
+- Update to 23.03.80
+ * New feature release
+
+-------------------------------------------------------------------
Tue Feb 28 09:45:20 UTC 2023 - Christophe Marin
- Update to 22.12.3
diff --git a/akonadi-calendar.spec b/akonadi-calendar.spec
index a0ffa06..19d5b54 100644
--- a/akonadi-calendar.spec
+++ b/akonadi-calendar.spec
@@ -16,12 +16,11 @@
#
-%define kf5_version 5.99.0
-# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
-%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
+%define kf5_version 5.104.0
+%define libname libKPim5AkonadiCalendar5
%bcond_without released
Name: akonadi-calendar
-Version: 22.12.3
+Version: 23.04.0
Release: 0
Summary: Akonadi calendar integration
License: LGPL-2.1-or-later
@@ -32,35 +31,38 @@ Source1: https://download.kde.org/stable/release-service/%{version}/src/%
Source2: applications.keyring
%endif
BuildRequires: extra-cmake-modules >= %{kf5_version}
-BuildRequires: cmake(KF5Akonadi)
-BuildRequires: cmake(KF5AkonadiContact)
BuildRequires: cmake(KF5CalendarCore)
-BuildRequires: cmake(KF5CalendarUtils)
BuildRequires: cmake(KF5Codecs)
BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF5I18n)
-BuildRequires: cmake(KF5IdentityManagement)
BuildRequires: cmake(KF5KIO)
-BuildRequires: cmake(KF5MailTransport)
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5XmlGui)
+BuildRequires: cmake(KPim5Akonadi)
+BuildRequires: cmake(KPim5AkonadiContact)
+BuildRequires: cmake(KPim5CalendarUtils)
+BuildRequires: cmake(KPim5IdentityManagement)
+BuildRequires: cmake(KPim5MailTransportAkonadi)
+BuildRequires: cmake(KPim5Mime)
BuildRequires: cmake(Qt5Test)
+Conflicts: libKF5AkonadiCalendar5 < %{version}
%description
This library provides calendar integration for Akonadi based Applications.
-%package -n libKF5AkonadiCalendar5
+%package -n %{libname}
Summary: KDE PIM Libraries: AkonadiCalendar
-Recommends: %{name}-lang
-Provides: %{name} = %{version}
+%requires_eq %{name}
+# Renamed
+Obsoletes: akonadi-calendar-lang <= 23.04.0
-%description -n libKF5AkonadiCalendar5
+%description -n %{libname}
This library provides calendar integration for Akonadi based Applications.
%package -n akonadi-plugin-calendar
Summary: Akonadi calendar integration - serializer plugin
-Requires: libKF5AkonadiCalendar5 = %{version}
+Requires: %{libname} = %{version}
%description -n akonadi-plugin-calendar
This package provides plugins required by PIM applications to read and write calendar data.
@@ -75,8 +77,8 @@ Kalendarac is a reminder daemon client for calendar events.
%package devel
Summary: KDE PIM Libraries: Build Environment
-Requires: libKF5AkonadiCalendar5 = %{version}
-Requires: cmake(KF5Akonadi)
+Requires: %{libname} = %{version}
+Requires: cmake(KPim5Akonadi)
Requires: cmake(KF5CalendarCore)
Requires: cmake(KF5I18n)
Requires: cmake(KF5WidgetsAddons)
@@ -86,29 +88,31 @@ Provides: akonadi5-calendar-devel = %{version}
%description devel
Development package for akonadi-calendar.
-%lang_package
+%lang_package -n %{libname}
%prep
%autosetup -p1 -n akonadi-calendar-%{version}
%build
-%cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir}
+%cmake_kf5 -d build -- -DBUILD_TESTING=ON
%cmake_build
%install
%kf5_makeinstall -C build
-%find_lang %{name} --with-man --all-name
+%find_lang %{libname} --with-man --all-name
-%ldconfig_scriptlets -n libKF5AkonadiCalendar5
+%ldconfig_scriptlets -n libKPim5AkonadiCalendar5
-%files -n libKF5AkonadiCalendar5
+%files
%license LICENSES/*
%{_kf5_debugdir}/*.categories
%{_kf5_debugdir}/*.renamecategories
-%{_kf5_libdir}/libKF5AkonadiCalendar.so.*
%exclude %{_kf5_debugdir}/org_kde_kalendarac.categories
+%files -n libKPim5AkonadiCalendar5
+%{_kf5_libdir}/libKPim5AkonadiCalendar.so.*
+
%files -n akonadi-plugin-calendar
%{_kf5_plugindir}/akonadi_serializer_kcalcore.so
%dir %{_kf5_sharedir}/akonadi
@@ -127,11 +131,13 @@ Development package for akonadi-calendar.
%{_kf5_sharedir}/dbus-1/services/org.kde.kalendarac.service
%files devel
+%dir %{_includedir}/KPim5
+%{_includedir}/KPim5/AkonadiCalendar/
%{_kf5_cmakedir}/KF5AkonadiCalendar/
-%{_kf5_includedir}/AkonadiCalendar/
-%{_kf5_libdir}/libKF5AkonadiCalendar.so
+%{_kf5_cmakedir}/KPim5AkonadiCalendar/
+%{_kf5_libdir}/libKPim5AkonadiCalendar.so
%{_kf5_mkspecsdir}/qt_AkonadiCalendar.pri
-%files lang -f %{name}.lang
+%files -n %{libname}-lang -f %{libname}.lang
%changelog