diff --git a/.files b/.files
index 796959e..5887502 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 7550173..e5b6e37 100644
--- a/.rev
+++ b/.rev
@@ -479,4 +479,20 @@
20.12.3 release
877009
+
+ 46f0869fae0198713d06b71b98e76870
+ 21.04.0
+
+ dimstar_suse
+ KDE Gear 21.04
+ 887574
+
+
+ 98be23bb48461717f65eb911f6570d81
+ 21.04.1
+
+ dimstar_suse
+ KDE Gear 21.04.1
+ 892704
+
diff --git a/akonadi-contact.changes b/akonadi-contact.changes
index efbe66a..f41e7e2 100644
--- a/akonadi-contact.changes
+++ b/akonadi-contact.changes
@@ -1,4 +1,36 @@
-------------------------------------------------------------------
+Wed May 12 06:06:38 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:55 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:56 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
diff --git a/akonadi-contact.spec b/akonadi-contact.spec
index ec18b92..5e13b64 100644
--- a/akonadi-contact.spec
+++ b/akonadi-contact.spec
@@ -18,18 +18,22 @@
%define rname akonadi-contacts
%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-contact
-Version: 20.12.3
+Version: 21.04.1
Release: 0
Summary: KDE PIM Libraries for Akonadi Contacts
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/%{rname}-%{version}.tar.xz
+%if %{with lang}
+Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
+Source2: applications.keyring
+%endif
BuildRequires: extra-cmake-modules >= %{kf5_version}
BuildRequires: kf5-filesystem
BuildRequires: cmake(Grantlee5)
@@ -50,17 +54,13 @@ BuildRequires: cmake(KF5Service) >= %{kf5_version}
BuildRequires: cmake(KF5TextWidgets) >= %{kf5_version}
BuildRequires: cmake(KF5WidgetsAddons) >= %{kf5_version}
BuildRequires: cmake(KF5XmlGui) >= %{kf5_version}
-BuildRequires: cmake(Qt5Test) >= 5.12.0
-BuildRequires: cmake(Qt5Widgets) >= 5.12.0
+BuildRequires: cmake(Qt5Test)
+BuildRequires: cmake(Qt5Widgets)
Requires: libKF5AkonadiContact5 = %{version}
Requires: libKF5ContactEditor5 = %{version}
Recommends: %{name}-lang
Provides: akonadi-contacts = %{version}
Obsoletes: akonadi-contacts < %{version}
-%if %{with lang}
-Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
-Source2: applications.keyring
-%endif
%description
This package provides a library used for handling personal contacts,
@@ -105,7 +105,7 @@ Requires: libKF5ContactEditor5 = %{version}
Requires: cmake(KF5Akonadi)
Requires: cmake(KF5Contacts)
Requires: cmake(KF5GrantleeTheme)
-Requires: cmake(Qt5Widgets) >= 5.12.0
+Requires: cmake(Qt5Widgets)
Obsoletes: akonadi-contacts-devel < %{version}
Provides: akonadi-contacts-devel = %{version}
Obsoletes: kdepim-apps-libs-devel <= 20.08.3
@@ -117,7 +117,7 @@ to develop KDE PIM applications.
%lang_package
%prep
-%setup -q -n %{rname}-%{version}
+%autosetup -p1 -n %{rname}-%{version}
%build
%cmake_kf5 -d build -- -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir}
@@ -136,11 +136,10 @@ to develop KDE PIM applications.
%files
%license LICENSES/*
-%dir %{_kf5_plugindir}
%dir %{_kf5_plugindir}/akonadi/contacts/
+%{_kf5_datadir}/akonadi/contact/
%{_kf5_debugdir}/*.categories
%{_kf5_debugdir}/*.renamecategories
-%{_kf5_datadir}/akonadi/contact/
%{_kf5_plugindir}/akonadi/contacts/plugins/
%{_kf5_plugindir}/kcm_akonadicontact_actions.so
%{_kf5_servicesdir}/akonadicontact_actions.desktop
@@ -169,12 +168,12 @@ to develop KDE PIM applications.
%dir %{_kf5_includedir}/ContactEditor
%dir %{_kf5_includedir}/akonadi
%dir %{_kf5_includedir}/contacteditor
+%{_kf5_cmakedir}/KF5AkonadiContact/
+%{_kf5_cmakedir}/KF5ContactEditor/
%{_kf5_includedir}/Akonadi/Contact/
%{_kf5_includedir}/ContactEditor
%{_kf5_includedir}/akonadi/contact/
%{_kf5_includedir}/contacteditor
-%{_kf5_cmakedir}/KF5AkonadiContact/
-%{_kf5_cmakedir}/KF5ContactEditor/
%{_kf5_libdir}/libKF5AkonadiContact.so
%{_kf5_libdir}/libKF5ContactEditor.so
%{_kf5_mkspecsdir}/qt_AkonadiContact.pri
diff --git a/akonadi-contacts-20.12.3.tar.xz b/akonadi-contacts-20.12.3.tar.xz
deleted file mode 120000
index 80243a3..0000000
--- a/akonadi-contacts-20.12.3.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeiajh4up4byxh5y4go77ornbxn45ljodvaguxyg63h3jbesuqo5ngq
\ No newline at end of file
diff --git a/akonadi-contacts-20.12.3.tar.xz.sig b/akonadi-contacts-20.12.3.tar.xz.sig
deleted file mode 100644
index 9f479f8..0000000
--- a/akonadi-contacts-20.12.3.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kD4ACgkQu0YzUNbv
-Me+r3g//aqvRc86qqp2ed+WWWkUy1DQQHdjzlUW9Yms6NxgpM90wIHMXEDZEW9Oo
-+3KUSu19b0hNKS4zMvLPW9uuqx1L8LxVlMmn9TVvit34AhWEEGMNb4WRv+pIJsxS
-Fkb38Dk9C8LxNqKDHHTyT6c4ftke6shoI5PKJxEaRDrDHMAiv+sFgKA30xbY/+S+
-3Q5MNghY/5KgGAxsWHIhL27yIa1gNbcjGZQ+e8unDRishK7BnwF+e150X/Vsv3Kw
-SpGpYWelyt6ef/KBt0Gdy9vz4eWmoBCboPJRZDIQ5O+hBVVqg6WRIP7gBt61AE/T
-J98TihJLxUcKQgJqbqcEdv2mGycdvzluaNnOc2xMBou4JiCn8z+dObk3JvXRhd3y
-qETeD4wNxtBJ4LDR2fNaSHOjBI1JmUnKxeTlhElYMGiACZXXP4356dA3ep3zYFkt
-dT3ySsQyO1JcybdBrO7b7H4rfMTD0JT7XR8IpyJfwwx0LBr5NBKrj2uYmCbb9Cq7
-vTGnMn8uQ3VrkgFbxDsPDHIKmaemgPWgTTIvHd4yZiLtPm/vn4vtbv4p6FeLRoJ4
-iuwkcckAuSkiuinXD3tUUGncC9dNz5/4aNw0Ezrkh2YK97OzX51lmom+CfL9G20B
-ddlSwO/Qg3kOzARq6GuO+5KZt2H9AlAp7ZOwGorCIOIIeyiavUQ=
-=RwjU
------END PGP SIGNATURE-----
diff --git a/akonadi-contacts-21.04.1.tar.xz b/akonadi-contacts-21.04.1.tar.xz
new file mode 120000
index 0000000..1af8c4f
--- /dev/null
+++ b/akonadi-contacts-21.04.1.tar.xz
@@ -0,0 +1 @@
+/ipfs/bafybeiexkpvp7gyutdkiq52d7izx3fihvvnesdu32c34ffahg72wfwkd3q
\ No newline at end of file
diff --git a/akonadi-contacts-21.04.1.tar.xz.sig b/akonadi-contacts-21.04.1.tar.xz.sig
new file mode 100644
index 0000000..cacdeaf
--- /dev/null
+++ b/akonadi-contacts-21.04.1.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmCaMgYACgkQu0YzUNbv
+Me+nUA/8CoC9lOh+qS2z2Fx3j+kQx44/Kr9MGykaBINVe33c8cO9tQrmkM5+XZea
+u1ZvOagqlujacjwBc1yz9PfNI9Ou0Os9W0YoleGm+OqUqifugOXbDQCqdunCtrZu
+2MOYRt5trdNnNNVIKesnbuLTxE18lJ1dw6QxelxClSAOXPZiZSPNAK/DprMxStSi
+KYOw8/QuxaS509RZsrRdlUtUyf7FI+VW7AlRRmtomjCVfzFSY7kKo+vNiVcOd3Dp
+vWpRirBpfRSgvFr9eA2kvvgvlQ+Gvny8n9kGpslVOA0Cv/30Roq2CgYh8dwignHA
+pqRXl3qIopF+vulDk3Nag9m7inyK4OCUWc8+xbGYo8hvSHeAV7zhicaU/0Qv35zF
+0Z46vWuxyEUvM+RNal5xUgabP0MqXmWIq5ZchHw1olNqiJlctSpqvl0cru87Y6De
+n26oLSUA3DbS4KTpCFYyfQGsga6kW8JNUpk0ySh0goZp/z5ygsAcYhqOsXkX1NmS
+oL322NtN/CuyzJSL4lzHzkT6tkYyAQCgcSLlMoC3AFqtjEVUCliSttf+rVAz3PGU
+5U1rXbgxcwLFNyuWi+TQD6/h9Wh8y711JhQ0GbWsAYrwEovbtK7Ql4iwtuTid0qJ
+a6cC5a+wF3evEvhTu4JDCJmOuyrPT4cU14oevBKBWU8V7qbVmiw=
+=wfpN
+-----END PGP SIGNATURE-----