diff --git a/.files b/.files
index 07237f7..91c32b1 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 4d0d3d3..6b052e5 100644
--- a/.rev
+++ b/.rev
@@ -647,4 +647,12 @@
KDE Gear 21.12.3
958759
+
+ aef86a58a5d7ce7138409f23115d8f14
+ 22.04.0
+
+ dimstar_suse
+ KDE release gear 22.04.0
+ 971676
+
diff --git a/0001-Make-sure-the-reminder-daemon-is-not-started-by-defa.patch b/0001-Make-sure-the-reminder-daemon-is-not-started-by-defa.patch
new file mode 100644
index 0000000..c124031
--- /dev/null
+++ b/0001-Make-sure-the-reminder-daemon-is-not-started-by-defa.patch
@@ -0,0 +1,24 @@
+From 085b191e39eeaa25549d3ecea15f7aaca1f6d35d Mon Sep 17 00:00:00 2001
+From: Luca Beltrame
+Date: Wed, 9 Mar 2022 06:15:22 +0100
+Subject: [PATCH] Make sure the reminder daemon is not started by default
+
+---
+ reminder-daemon/org.kde.kalendarac.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/reminder-daemon/org.kde.kalendarac.desktop b/reminder-daemon/org.kde.kalendarac.desktop
+index 0c175d4..e80f8da 100644
+--- a/reminder-daemon/org.kde.kalendarac.desktop
++++ b/reminder-daemon/org.kde.kalendarac.desktop
+@@ -44,6 +44,6 @@ GenericName[uk]=Клієнт фонової служби нагадувань
+ GenericName[x-test]=xxReminder Daemon Clientxx
+ Terminal=false
+ X-KDE-autostart-phase=2
+-X-KDE-autostart-condition=kalendaracrc:General:Autostart:true
++X-KDE-autostart-condition=kalendaracrc:General:Autostart:false
+ X-DBUS-StartupType=Unique
+
+--
+2.35.3
+
diff --git a/akonadi-calendar-21.12.3.tar.xz b/akonadi-calendar-21.12.3.tar.xz
deleted file mode 120000
index 630aa34..0000000
--- a/akonadi-calendar-21.12.3.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeibn75lduiihg72geynl57pzzjd2k2yl4ri7ecetlpwfpes36dyjme
\ No newline at end of file
diff --git a/akonadi-calendar-21.12.3.tar.xz.sig b/akonadi-calendar-21.12.3.tar.xz.sig
deleted file mode 100644
index 79ad61b..0000000
--- a/akonadi-calendar-21.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmIdZdsACgkQu0YzUNbv
-Me/6UA/9FhWuuJGJJDFQ5HOW7P+JFW5iw7RQ6msDfSQ4+ltCYK5O7GZRuAMRyq6k
-c2N6013ktxRPJvbEIxxz6XgDboMQ9lLqsEQbQ/tTLNBh7+dayvcTG+A9QYOnXFh6
-yi0PxmOiygUuKd1qEKMSsVad2M8TBjZisvBrXxIb3hNe8hSN3CJUOvbPUg9NlToP
-7WRxzZ2obC3QeeU8FjAneKgCGkN6YHqCCMtFhUZvEQSNwYTgA1gdtcidlnQXFqOb
-EKZ7aS1L7E0b1Ht91IwH9kVl8xkZHAdctoe4DJ+lInlcVRcT7en0MMJO8ibYE0aJ
-LNYEwCAXhgpWusgb2Kbx8CNPhRjRyUlXmIZqG2gQPOhCbgTo3xiQ5vPhf9xBD6Dt
-gwdRJiuyoTt8H/a1YsUsZ2tOHtIhGAnVDC6f738bJJ87mUEiLBnE9DPoX3Bvllxk
-YP146M3T+tmjHBz6KfMtGnrfMJsIqHItLTimziBwC87Sb1Z8p6y4SJA6kB7gvGWF
-mRG3mSt0mKjQd0KdwUIGtn2UISFHoaeAA7r7Wn2u+QQJgn+SR3UNh8V/GUsSM0C3
-3jEs/fKAEeEym2TB7p1jNgCYabSlEoAZistcveqYr6I7ZzJeMKJvXpRa1ULGIbeY
-oeVuDWnjXJNp3ncXhuryTNFVuGoGi0zONE6ViLNnErpo0xTCPjQ=
-=ikkc
------END PGP SIGNATURE-----
diff --git a/akonadi-calendar-22.04.0.tar.xz b/akonadi-calendar-22.04.0.tar.xz
new file mode 120000
index 0000000..086fcc9
--- /dev/null
+++ b/akonadi-calendar-22.04.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeibtnuurymmn4fpbdnd4nln6udveucft42df7jiwckqiriou5swzqq
\ No newline at end of file
diff --git a/akonadi-calendar-22.04.0.tar.xz.sig b/akonadi-calendar-22.04.0.tar.xz.sig
new file mode 100644
index 0000000..ffbfd49
--- /dev/null
+++ b/akonadi-calendar-22.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmJYunEACgkQu0YzUNbv
+Me+1Pg/8DWEgfGCTmCrEPz4wqQYzaZsGDUEkmN4scxemo2gw1z6C5Ydr9mcBwel+
+PJhEEyOsb22C6nUOYmw3TZmX+9pZzRu/VnnvlLAqcjpwpxlPYBr0R4YjNb04OkHV
+JTHpEDU8+47RBwsnkTrA8wa3E4j0cm53Nm9Yp0HB7l+KHYYuUtnRB8OK+0V1jpKn
+SuT9fMoIoTxWZEjGJbvq8R8/t3i5QhQvlDqwXNJFk7TZgbSCaOckIFgRW8M3Dnbr
+C22z/rA63BvOeAC20qEQ3QXGBYnLPngIpWXhd/hPNrpgiVZEi1Pc+iRaJYrISTXu
+JNnYJNbUlDP8GMuJ4E51AlMp+EZ/BqVJGDtruki/pvqVazvUDYnpvhjCi64im8T1
+D8UeyGHQ09xTiF1ilitDatd+GyR/BoZz1Mf4jPc+kYnXuKUoGZtpTsvEUaAXj48Y
+/7SsCKR/87X5cE6o2pNq9RYxLtpulX5jywObMaHGTALnqtm2AbzFUeievhk5VpyN
+c+NnGBlXrI7xUeTX1u4dqq/ihMYqXf5Whe0Szz3npV2k0hHzWdaKFPs4OKOGqzZC
+kKG573bhYWgXwJqmhWaRN2Gu1Sx37RA01A5twdM3yjfCWyagqeCg7d5RJAfrpt7i
+zxf5ocSEcmJvCQFH6Cul50ZudrcDNEIv8xsShZVWybypTl9a6PQ=
+=eC3Y
+-----END PGP SIGNATURE-----
diff --git a/akonadi-calendar.changes b/akonadi-calendar.changes
index 2c68123..246e6ab 100644
--- a/akonadi-calendar.changes
+++ b/akonadi-calendar.changes
@@ -1,4 +1,45 @@
-------------------------------------------------------------------
+Mon Apr 18 07:50:34 UTC 2022 - Christophe Giboudeaux
+
+- Update to 22.04.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/gear/22.04.0/
+
+-------------------------------------------------------------------
+Fri Apr 8 18:16:44 UTC 2022 - Christophe Giboudeaux
+
+- Update to 22.03.90
+ * New feature release
+
+-------------------------------------------------------------------
+Wed Mar 23 08:13:24 UTC 2022 - Christophe Giboudeaux
+
+- Update to 22.03.80
+ * New feature release
+- Changes since 21.12.3:
+ * Fix compile without deprecated method
+ * Move the reminder daemon from Kalendar here
+ * Explicitly link against MailTransport where needed
+ * Fix compile against qt6
+ * Fix include
+ * Use new akonadi calendar install include
+ * Make it compile against qt6
+ * Use properly namespaced includes from KIdentityManagement
+ * Use upper case includes
+ * Fix install headers
+ * Adapt build system for building against qt6
+ * Determine active alarms without copying incidences
+ * Fix cppcheck warning
+ * Correct invalid paths used to PIM projects
+
+--------------------------------------------------------------------
+Wed Mar 9 05:17:38 UTC 2022 - Luca Beltrame
+
+- Add patch to disable the autostart of the new reminder daemon:
+ * 0001-Make-sure-the-reminder-daemon-is-not-started-by-defa.patch
+
+-------------------------------------------------------------------
Tue Mar 1 09:56:28 UTC 2022 - Christophe Giboudeaux
- Update to 21.12.3
diff --git a/akonadi-calendar.spec b/akonadi-calendar.spec
index 7dc4d26..0f2422a 100644
--- a/akonadi-calendar.spec
+++ b/akonadi-calendar.spec
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
%bcond_without released
Name: akonadi-calendar
-Version: 21.12.3
+Version: 22.04.0
Release: 0
Summary: Akonadi calendar integration
License: LGPL-2.1-or-later
@@ -32,6 +32,8 @@ Source: https://download.kde.org/stable/release-service/%{version}/src/%
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
+# PATCH-FIX-OPENSUSE
+Patch0: 0001-Make-sure-the-reminder-daemon-is-not-started-by-defa.patch
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: cmake(KF5Akonadi)
BuildRequires: cmake(KF5AkonadiContact)
@@ -43,6 +45,7 @@ BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF5IdentityManagement)
BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5MailTransport)
+BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5XmlGui)
BuildRequires: cmake(Qt5Test)
@@ -69,6 +72,14 @@ Requires: libKF5AkonadiCalendar5 = %{version}
%description -n akonadi-plugin-calendar
This package provides plugins required by PIM applications to read and write calendar data.
+%package -n kalendarac
+Summary: Reminder daemon client
+# Moved from kalendar 1.0.0 to akonadi-calendar
+Conflicts: kalendar = 1.0.0
+
+%description -n kalendarac
+Kalendarac is a reminder daemon client for calendar events.
+
%package devel
Summary: KDE PIM Libraries: Build Environment
Group: Development/Libraries/KDE
@@ -106,6 +117,7 @@ Development package for akonadi-calendar.
%{_kf5_debugdir}/*.categories
%{_kf5_debugdir}/*.renamecategories
%{_kf5_libdir}/libKF5AkonadiCalendar.so.*
+%exclude %{_kf5_debugdir}/org_kde_kalendarac.categories
%files -n akonadi-plugin-calendar
%{_kf5_plugindir}/akonadi_serializer_kcalcore.so
@@ -114,13 +126,16 @@ Development package for akonadi-calendar.
%dir %{_kf5_sharedir}/akonadi/plugins/serializer
%{_kf5_sharedir}/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
+%files -n kalendarac
+%{_kf5_bindir}/kalendarac
+%{_kf5_configdir}/autostart/org.kde.kalendarac.desktop
+%{_kf5_debugdir}/org_kde_kalendarac.categories
+%{_kf5_notifydir}/kalendarac.notifyrc
+%{_kf5_sharedir}/dbus-1/services/org.kde.kalendarac.service
+
%files devel
-%dir %{_kf5_includedir}/Akonadi
-%dir %{_kf5_includedir}/akonadi
%{_kf5_cmakedir}/KF5AkonadiCalendar/
-%{_kf5_includedir}/Akonadi/Calendar/
-%{_kf5_includedir}/akonadi-calendar_version.h
-%{_kf5_includedir}/akonadi/calendar/
+%{_kf5_includedir}/AkonadiCalendar/
%{_kf5_libdir}/libKF5AkonadiCalendar.so
%{_kf5_mkspecsdir}/qt_AkonadiCalendar.pri