diff --git a/.files b/.files
index 25d7824..784932c 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 31b618f..e067d3d 100644
--- a/.rev
+++ b/.rev
@@ -431,4 +431,28 @@
KDE Applications 20.12.1
861097
+
+ 2c0cc026d2ed4885fd9575f0f53e0a33
+ 20.12.2
+
+ dimstar_suse
+ 20.12.2 release
+ 869239
+
+
+ 86797decb707cd2b7f651e323679d2f0
+ 20.12.3
+
+ dimstar_suse
+ 20.12.3 release
+ 877010
+
+
+ 69b5ce206e625c009e83631abab8fb70
+ 21.04.0
+
+ dimstar_suse
+ KDE Gear 21.04
+ 887575
+
diff --git a/akonadi-import-wizard-20.12.1.tar.xz b/akonadi-import-wizard-20.12.1.tar.xz
deleted file mode 120000
index aee1be9..0000000
--- a/akonadi-import-wizard-20.12.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeibrvjzimgkcp5svm3bcqbz5sjqzzusso5ns42j35ebn6bntk77bje
\ No newline at end of file
diff --git a/akonadi-import-wizard-20.12.1.tar.xz.sig b/akonadi-import-wizard-20.12.1.tar.xz.sig
deleted file mode 100644
index 73b6683..0000000
--- a/akonadi-import-wizard-20.12.1.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwekACgkQ29LOiT4t
-HIf/nwgAj08m313yDL6Se4QGrGO/i+tqeGgmK6MssjpofziVsi/AZMSnC5Hvvx84
-y5Ixs/ZobnkPxGCTSouU3kYSkNbGfHKoFJi1yVb8u/2T0LXDPLwcE9Rj1FLGiIRt
-vGddnYJSVBNjVVk1A222X+GZaYaRc0EKLdecuq2acuqbor7Bwbw3+NETLarziKAs
-Ty+qnEBehXWI9F4wRkzzd7jHDOjwTeDs5hNeo4n3bnnsPXzRUurlaXvQRnbMcGp0
-A7kDK86sSMeLSnqi7izvByuvAzkjVGhDyzhDK2xuUDBUqkEmO+Nrb8TORHHJO8LJ
-Eh7N4zfwJH0GUxqNGETJAMJ6wDKnig==
-=oqQZ
------END PGP SIGNATURE-----
diff --git a/akonadi-import-wizard-21.04.0.tar.xz b/akonadi-import-wizard-21.04.0.tar.xz
new file mode 120000
index 0000000..6d17e8e
--- /dev/null
+++ b/akonadi-import-wizard-21.04.0.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeibiyxgtmeb2qez5526hfab7vbcpgd6x6ljmp2wgy4v4l63dfhh7qi
\ No newline at end of file
diff --git a/akonadi-import-wizard-21.04.0.tar.xz.sig b/akonadi-import-wizard-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..3d467ee
--- /dev/null
+++ b/akonadi-import-wizard-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvAACgkQu0YzUNbv
+Me8j5g/8CZQGPjme04dmbtmbciL+3+0SBWw1kE6aSsH4tSHr5Yg1nCRvkP40iafV
+A/XFx7aLa4pSrLQDnMc3K/10LY1Hp2BsXIFKJSv3kEoTh6DbN71IOA+SN9BGxwiv
+s7hWu0B3PquvuiiMhSzkv6XbQrIML7wwG5v05jWuaiucBK1Knd4GTaDn8//7YKfq
+JVheCmBkb2Cr8gK+4lLWqIh2ZrKLzK40d3Hzufrlf8YpAtblXgZ/xLkQgq/2nZED
+1FTOIXSx3IzQmnDaMypWIa5uZAEQ32QB//6cpZ9D/PLOG21vXXr7yNFpclbFcoAx
+e12g0zPTAG39J4vv9kcwZQwP0B8ZpcYxLvHZBxvE81pl4GRxTK1cG1lOVntVNhxH
+K5XE02jeJTXI47STPbhyiOujGTfjiGMUsLw66n8CxKH4zBzN68eE9a01gqkfh0k2
+hEHauLWddCk+/uuUdHv/YsGUnm4ZD08Cxzgrg9euoDfmWKQMTKS+mhqAsnwGC2N3
+oNzh7Wa6jfA5EHKmdex9DR7HISS2XB3S52klsmD+v01Ml21OUjXKsb2uzFpbd1ao
+W5sMhPpI91eI8qANqAJb0crvQ7sMqztFxQov8NlZWcnK8zkVRc/9u3YxjWiJ8Gd3
+pFSSZBBzzTgpy9dVeiyhfoLGDXkS1ZrWbzQtAVrZHtoR0ajI258=
+=8utO
+-----END PGP SIGNATURE-----
diff --git a/akonadi-import-wizard.changes b/akonadi-import-wizard.changes
index d0a343b..adcd99d 100644
--- a/akonadi-import-wizard.changes
+++ b/akonadi-import-wizard.changes
@@ -1,4 +1,45 @@
-------------------------------------------------------------------
+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:22 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
+- Too many changes to list here.
+
+-------------------------------------------------------------------
+Thu Mar 4 06:09:18 UTC 2021 - Luca Beltrame
+
+- Update to 20.12.3
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/20.12.3
+- No code change since 20.12.2
+
+-------------------------------------------------------------------
+Wed Feb 3 08:27:38 UTC 2021 - Christophe Giboudeaux
+
+- Update to 20.12.2
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2021-02-apps-update
+- No code change since 20.12.1
+
+-------------------------------------------------------------------
Tue Jan 5 12:24:29 UTC 2021 - Luca Beltrame
- Update to 20.12.1
diff --git a/akonadi-import-wizard.spec b/akonadi-import-wizard.spec
index 7a90b11..08a0571 100644
--- a/akonadi-import-wizard.spec
+++ b/akonadi-import-wizard.spec
@@ -17,18 +17,22 @@
%define lname libKPimImportWizard5
-%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-import-wizard
-Version: 20.12.1
+Version: 21.04.0
Release: 0
Summary: Assistant to import PIM data
License: GPL-2.0-or-later AND 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: fdupes
BuildRequires: gettext-devel
@@ -52,18 +56,16 @@ BuildRequires: cmake(KF5MailTransport)
BuildRequires: cmake(KF5MessageCore)
BuildRequires: cmake(KF5PimCommon)
BuildRequires: cmake(KF5Wallet)
-BuildRequires: cmake(Qt5Gui) >= 5.10.0
-BuildRequires: cmake(Qt5Widgets) >= 5.10.0
+BuildRequires: cmake(Qt5Gui) >= 5.14.0
+BuildRequires: cmake(Qt5Keychain)
+BuildRequires: cmake(Qt5Widgets) >= 5.14.0
# It can only build on the same platforms as Qt Webengine
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64
-%if %{with lang}
-Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2: applications.keyring
-%endif
Recommends: %{name}-lang
%description
-Assistant to import PIM data from other applications into Akonadi for use in KDE PIM applications.
+Assistant to import PIM data from other applications into Akonadi for use in
+KDE PIM applications.
%package -n %{lname}
Summary: Assistant to import PIM data
@@ -81,12 +83,13 @@ Requires: %{lname} = %{version}
Requires: %{name} = %{version}
%description devel
-This package contains development headers to build new import plugins for KDE PIM.
+This package contains development headers to build new import plugins for
+KDE PIM applications.
%lang_package
%prep
-%setup -q
+%autosetup -p1
%build
%cmake_kf5 -d build -- -DBUILD_TESTING=OFF
@@ -99,24 +102,23 @@ This package contains development headers to build new import plugins for KDE PI
%{kf5_find_htmldocs}
%endif
%suse_update_desktop_file -u org.kde.akonadiimportwizard Network Email
-rm -rf %{buildroot}%{_libdir}/libimportwizard.so
%post -n %{lname} -p /sbin/ldconfig
%postun -n %{lname} -p /sbin/ldconfig
%files
%license LICENSES/*
-%{_kf5_debugdir}/importwizard.categories
-%{_kf5_debugdir}/importwizard.renamecategories
%dir %{_kf5_iconsdir}/hicolor/256x256
%dir %{_kf5_iconsdir}/hicolor/256x256/apps
%dir %{_kf5_plugindir}/importwizard
%dir %{_kf5_sharedir}/importwizard
%dir %{_kf5_sharedir}/importwizard/pics
%dir %{_kf5_sharedir}/kconf_update/
+%doc %lang(en) %{_kf5_htmldir}/en/importwizard/
%{_kf5_applicationsdir}/org.kde.akonadiimportwizard.desktop
%{_kf5_bindir}/akonadiimportwizard
-%doc %lang(en) %{_kf5_htmldir}/en/importwizard/
+%{_kf5_debugdir}/importwizard.categories
+%{_kf5_debugdir}/importwizard.renamecategories
%{_kf5_iconsdir}/hicolor/*/apps/kontact-import-wizard.png
%{_kf5_plugindir}/importwizard/*.so
%{_kf5_sharedir}/importwizard/pics/step1.png
@@ -129,10 +131,10 @@ rm -rf %{buildroot}%{_libdir}/libimportwizard.so
%files devel
%dir %{_includedir}/KPim
%dir %{_kf5_includedir}/KPim
+%{_includedir}/KPim/importwizard_version.h
%{_kf5_cmakedir}/KPimImportWizard/
%{_kf5_includedir}/KPim/ImportWizard/
%{_kf5_includedir}/KPim/importwizard/
-%{_includedir}/KPim/importwizard_version.h
%{_kf5_libdir}/libKPimImportWizard.so
%if %{with lang}
diff --git a/applications.keyring b/applications.keyring
index d2b6a35..864f48e 100644
Binary files a/applications.keyring and b/applications.keyring differ