diff --git a/.files b/.files
index eda1ce7..5705f31 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index bc8849b..043fea5 100644
--- a/.rev
+++ b/.rev
@@ -447,4 +447,20 @@
20.12.3 release
877011
+
+ 26c757e58c5e8800c442e0ccef623838
+ 21.04.0
+
+ dimstar_suse
+ KDE Gear 21.04
+ 887576
+
+
+ 4f4883a7e5079eefa692d5eb72253720
+ 21.04.1
+
+ dimstar_suse
+ KDE Gear 21.04.1
+ 892706
+
diff --git a/akonadi-mime-20.12.3.tar.xz b/akonadi-mime-20.12.3.tar.xz
deleted file mode 120000
index e734df9..0000000
--- a/akonadi-mime-20.12.3.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreihulwl537wvslnys7fx3uhfagb524vq6k63oyiwrel32s3ttv65wy
\ No newline at end of file
diff --git a/akonadi-mime-20.12.3.tar.xz.sig b/akonadi-mime-20.12.3.tar.xz.sig
deleted file mode 100644
index 7cfaf19..0000000
--- a/akonadi-mime-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kD4ACgkQu0YzUNbv
-Me8Jwg/9Hs1QEbkMJm3rsyIgfE0mi8ShjgrBHT+7YvVrlWM9ZG3vz3UYil0ZF5Xc
-ynAbIrbNgdk1JZOmEVI4S6eR5MYcJtqtpqwYxGcxQHGuoSVZpqTlWPF/yqQVObzo
-UZgCqLsg0tTduGgiK2wTMG5R79O/uJ9ADgpOEq6SS5AkBcta4XogzeaJeAkbyNCD
-ABLIHcuAfUuSLJb7WSiHwf0VaGR93e1Yl5kex1ex8RB2j2kx7fw4g5DFoVWzcuQD
-g5uD4TQv7eqZTYsLIlpKl8qROE0mFiRurclZrpNmBz4OOgglzHxmRCvEy/eXXDSm
-qjwmi6X+uJx55B6jZ58r+P4gk/b5W+N9WIugxkEcnR4XwczMB45aXyvrC8gQIjBM
-Dl9eLGXJiXHk04okxdWkCIa6ri6RH++8oiziY8GBC1m9B1ocmjXaFZgzgphn6S9g
-1ESLiDhPqLowB0bWUcJrgzP2lfAVJXMKXTpREgy7M2YNhYraoc2ZnpmNsIZhtU2V
-T47VDCmEBbxpNifaZsSo10AyX49EubsuTP7A2FG8Nr7GLz1qA1xzPpbvmcLorMrf
-/T4FtB+uQW40pK4nDdfbx8I6+YMCrHCjTcS6Wk+YDIyawyhOzo2yEa9SY1D9zKu4
-T565HeIWhq5+40uyoVGALaPFdlxMGU6RrbiLEn56b4LR7lTqfa8=
-=k4Ke
------END PGP SIGNATURE-----
diff --git a/akonadi-mime-21.04.1.tar.xz b/akonadi-mime-21.04.1.tar.xz
new file mode 120000
index 0000000..4268ffb
--- /dev/null
+++ b/akonadi-mime-21.04.1.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafkreid6tivexotmhhannysnqr4rtgmi5bzguiu5n73gqu6jipge3prngm
\ No newline at end of file
diff --git a/akonadi-mime-21.04.1.tar.xz.sig b/akonadi-mime-21.04.1.tar.xz.sig
new file mode 100644
index 0000000..9f0da59
--- /dev/null
+++ b/akonadi-mime-21.04.1.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmCaMgsACgkQu0YzUNbv
+Me/SSxAAg4SPseTYI4mUEdZpXUvFYnUSbX+Dp0iBFy38Om2uYrFWY6mV99GsSuyF
+g5ei0elwfXDBdOOSkBYA6q+XjdbHj3ZmJMlCMQRYIU0Nl6CfNAg/KgiFdD9+i2nB
+Zr/UHks04MVN9RK5wpXBDctfVtKXEdtPGjqHrfzxVK4VfiN2lA4b0gcO2YvZbNnm
+LlLVNJ2034vWRBPGjplo7Ml8m8X1yLzdhm5PVcHP5zed6k8BTzfL6Ls1GD2WWdcQ
+aUDq/EbQjuGQhhzDEduEuC0BRAARE0fyIR4KqVeRhtVoQwwpXg6nJY1ulmZQQH1c
+juCf1vZ8weoNh6ORcR0FpFSVLgtdDv3t1RUCAoRg2wRaBfZMuOOziLXucCxYMKnH
+egjrLJgZ3wkUvS8cJ59YzihbsY4YvuMlYxMjvkNvhMrlFqyli4m/ZmWk0kQtMLNs
+nISPsgZmMMq9/8CfwWIoUsXKbhdhpL6HU4ZLH1cyAZFx93lyyfOP2cvobyyqdyyN
++9A8rXnmMIzYJ+pxjm7hsVltXs+0o1iz+vGUxc2mJ/Vhl49wWule1ASTEkmnxcYq
+hzzBoPu64Clo/yJQAr87I1vwUEtyToylE6oAbMGZEezG/EV+a/6vpukfsLfxrXZN
+NzhUeXji44j1mZd1n6OYi1Cy6xTKT7LQCwf8DnLYb/HCVoQCRgE=
+=UQC2
+-----END PGP SIGNATURE-----
diff --git a/akonadi-mime.changes b/akonadi-mime.changes
index 8fe5305..3ffe846 100644
--- a/akonadi-mime.changes
+++ b/akonadi-mime.changes
@@ -1,4 +1,44 @@
-------------------------------------------------------------------
+Wed May 12 06:06:39 UTC 2021 - Christophe Giboudeaux
+
+- Update to 21.04.1
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/21.04.1
+- No code change since 21.04.0
+
+-------------------------------------------------------------------
+Fri Apr 16 16:10:56 UTC 2021 - Christophe Giboudeaux
+
+- Update to 21.04.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/gear/21.04
+- No code change since 21.03.90
+
+-------------------------------------------------------------------
+Fri Apr 9 17:39:23 UTC 2021 - Christophe Giboudeaux
+
+- Update to 21.03.90
+ * New feature release
+- No code change since 21.03.80
+
+-------------------------------------------------------------------
+Sun Mar 21 13:26:57 UTC 2021 - Christophe Giboudeaux
+
+- Update to 21.03.80
+ * New feature release
+- Changes since 20.12.3:
+ * Use auto vs auto * where it's possible
+ * Use git commit hook
+ * run git clang-format
+ * Modernize code
+ * Allow to use UNITY build
+ * Remove KF5Codecs
+ * operator+/- is disabled for QFlags in qt6
+ * Add missing override on destructor
+
+-------------------------------------------------------------------
Thu Mar 4 06:09:19 UTC 2021 - Luca Beltrame
- Update to 20.12.3
diff --git a/akonadi-mime.spec b/akonadi-mime.spec
index 310b19b..a0f494b 100644
--- a/akonadi-mime.spec
+++ b/akonadi-mime.spec
@@ -17,18 +17,22 @@
%define sonum 5
-%define kf5_version 5.75.0
+%define kf5_version 5.79.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}')}
%bcond_without lang
Name: akonadi-mime
-Version: 20.12.3
+Version: 21.04.1
Release: 0
Summary: MIME email parser for KDE PIM
License: LGPL-2.1-or-later
Group: System/GUI/KDE
URL: https://www.kde.org
Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+%if %{with lang}
+Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2: applications.keyring
+%endif
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: kf5-filesystem
BuildRequires: libxslt-devel
@@ -41,16 +45,13 @@ BuildRequires: cmake(KF5ItemModels) >= %{kf5_version}
BuildRequires: cmake(KF5KIO) >= %{kf5_version}
BuildRequires: cmake(KF5Mime)
BuildRequires: cmake(KF5XmlGui) >= %{kf5_version}
-BuildRequires: cmake(Qt5Test) >= 5.6.0
-BuildRequires: cmake(Qt5Widgets) >= 5.6.0
+BuildRequires: cmake(Qt5Test) >= 5.14.0
+BuildRequires: cmake(Qt5Widgets) >= 5.14.0
Recommends: %{name}-lang
-%if %{with lang}
-Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2: applications.keyring
-%endif
%description
-This package provides libraries needed for the correct parsing of email messages.
+This package provides libraries needed for the correct parsing of email
+messages.
%package -n libKF5AkonadiMime5
Summary: MIME email parser for KDE PIM - core library
@@ -58,7 +59,8 @@ Group: System/Libraries
Requires: %{name} >= %{version}
%description -n libKF5AkonadiMime5
-This package contains the core libraries needed for the correct parsing of email messages.
+This package contains the core libraries needed for the correct parsing of email
+messages.
%package -n akonadi-plugin-mime
Summary: MIME email parser for KDE PIM - runtime plugins
@@ -66,7 +68,8 @@ Group: System/Libraries
Requires: libKF5AkonadiMime5 >= %{version}
%description -n akonadi-plugin-mime
-This package provides plugins required by PIM applications read and write parsed email data.
+This package provides plugins required by PIM applications read and write parsed
+email data.
%package devel
Summary: MIME email parser for KDE PIM - development files
@@ -81,7 +84,7 @@ in KDE PIM applications.
%lang_package
%prep
-%setup -q -n akonadi-mime-%{version}
+%autosetup -p1 -n akonadi-mime-%{version}
%build
%cmake_kf5 -d build -- -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir}
@@ -103,7 +106,6 @@ in KDE PIM applications.
%files
%license LICENSES/*
-%dir %{_kf5_configkcfgdir}
%{_kf5_configkcfgdir}/specialmailcollections.kcfg
%{_kf5_mkspecsdir}/qt_AkonadiMime.pri
%{_kf5_sharedir}/mime/packages/x-vnd.kde.contactgroup.xml
@@ -119,10 +121,10 @@ in KDE PIM applications.
%license LICENSES/*
%dir %{_kf5_includedir}/Akonadi
%dir %{_kf5_includedir}/akonadi
+%{_kf5_cmakedir}/KF5AkonadiMime/
%{_kf5_includedir}/Akonadi/KMime/
%{_kf5_includedir}/akonadi-mime_version.h
%{_kf5_includedir}/akonadi/kmime/
-%{_kf5_cmakedir}/KF5AkonadiMime/
%{_kf5_libdir}/libKF5AkonadiMime.so
%if %{with lang}