From 579a898cf5790735d04963867697df19755684701c5dd19f485734804334285c Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Mon, 19 Apr 2021 13:30:59 +0000
Subject: [PATCH] 21.04 release

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kimap?expand=0&rev=199
---
 kimap-21.03.90.tar.xz     |  3 ---
 kimap-21.03.90.tar.xz.sig | 16 ----------------
 kimap-21.04.0.tar.xz      |  3 +++
 kimap-21.04.0.tar.xz.sig  | 16 ++++++++++++++++
 kimap.changes             |  9 +++++++++
 kimap.spec                | 18 +++++++++---------
 6 files changed, 37 insertions(+), 28 deletions(-)
 delete mode 100644 kimap-21.03.90.tar.xz
 delete mode 100644 kimap-21.03.90.tar.xz.sig
 create mode 100644 kimap-21.04.0.tar.xz
 create mode 100644 kimap-21.04.0.tar.xz.sig

diff --git a/kimap-21.03.90.tar.xz b/kimap-21.03.90.tar.xz
deleted file mode 100644
index f2bdf89..0000000
--- a/kimap-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:276f6e8e3fc9697c3542531a16081f831c14d17cc5476dc1d5f425d300d0862b
-size 128272
diff --git a/kimap-21.03.90.tar.xz.sig b/kimap-21.03.90.tar.xz.sig
deleted file mode 100644
index bbd9621..0000000
--- a/kimap-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCrwACgkQu0YzUNbv
-Me+EMA/8CSocDk2f0uGgHnobXDXU4oAy/e/DdhNb2UmRHNnSXyc1Q3K6If1xS7bn
-nT9tSjRiMAlRmxNDq+lfVTGVaooavL7jzVSU2+g9wVXIJc5Pa9G0ivS5jDUUcORj
-c9S7p/KROTszA1NC+n+EZhR72/uLdwmDZ5u3Fj2r7CrWb09b7K0sBqJEmp8uCEVJ
-o3wU8Pe+BTnMzaHUzeL8JXy1v+N1KZF7u1El/ooQ8Eab/9ttzmDdyz3+jNlHuOIj
-hh3l4RcFLwqhpcROM8XZeguKaSCtppHnm/SH7ExYlHI098hMsu+zVeAfnd/bWxrl
-h+ZmUfWZBJHj182OehwAcw3RhG2m8gFAjGf4nqVH5xf8W14fFiNHZJUX+mkoIgL7
-DUnyYjuSrnLv3llwX8dPaPVzvoTTSHy+XdFX7V/u7Z2LEfeAhUVGZ/uT9qtaQZXD
-WDeKtU/va+NKONGRRuwD4Oyq4tJZQYKigr8R4RF7mp0C6d67v+KJMSOMDyoxgiox
-RQQ93glguAFcTrZwmmVxU1DHejKr1wtlpTky14Q431xjdOiW+1TCwrXMorGrR/Wj
-dD1qUwBqu/+m7L2wRA6Keym2b6l0gvQPN4+KKEG/lS8ntbSEba4f36fuyReMevTV
-prGOA3hb8m8L9cNcaBFF3crsXuHRWBdvKl4wSdz3giALRgpS8tI=
-=F8pC
------END PGP SIGNATURE-----
diff --git a/kimap-21.04.0.tar.xz b/kimap-21.04.0.tar.xz
new file mode 100644
index 0000000..b3fca61
--- /dev/null
+++ b/kimap-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd2e04c17c2fad5ec51cf1087ea59ffe1c72070afed80f4e4bbae0f0a3e66c39
+size 128292
diff --git a/kimap-21.04.0.tar.xz.sig b/kimap-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..562c846
--- /dev/null
+++ b/kimap-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VvwACgkQu0YzUNbv
+Me+1dQ//dNJnONMNJddoSaZFqHqu6WMJqkiMNgeUqPf5ciBwq6vQhkBz+y766K4/
+Obt9CZUqwplO2QxctwamkqHkgRohCRkUSkFCXKD8oBxH37PCstMmUvK+EXYtYpqX
+M+U+UCiNAOvLvumLQXCQHV+X1QdChGtY7umM1l8pIBNl5u0bdNUmR6eEsQSBnY0p
+9kki6CXuYYWtBgC3tb+GZL0rj97khI5eVhjY7tkpKnFAQU0YTGauLDeYETh7kThE
+S4KmHPUB956bPcmh1zRCYthnS08jkk5QSOWe54DAhcKXEy9xzn+Ktsh1XejWmqVs
+twEnu7mwcpikGEIHbPkEZIJ5f6bqZjMwLXfjPB5+8Negl9g8PRpmy4S6EGZ6Qt3p
+934qhdHBBD3r9pu7SEA+CLTUFP5lfQhH00gBmoUbCoaHAbq78m2IwnrVO/394TMy
+lXXSwySLbI/wkUvsV8gReS08a9wJvWx6CcOVx/LcujdfBQBBtAP+IUKKogGhelBr
+oPl7yY0mJHAgItM9bvXSbsWTvAPBWHdHbNFwIxCX85gqBgeEd69n1RKbQ9ohP+Fy
+bbTqlPUDKzJ0Rxr2Xyxa6V9N5cCL74DboUtscBTGPXA6vsiHgig2m7eNeC+XsvgQ
+C82wkqEZVb/ucJk0RcpxBEziBkTZ0hoV36dpwA4Dfk/aC1mEdX8=
+=oAI7
+-----END PGP SIGNATURE-----
diff --git a/kimap.changes b/kimap.changes
index 0296459..ad54c9b 100644
--- a/kimap.changes
+++ b/kimap.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:11:59 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/releases/21.04.0
+- No code change since 21.03.90
+
 -------------------------------------------------------------------
 Fri Apr  9 17:40:26 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/kimap.spec b/kimap.spec
index 90807c1..32dc0d0 100644
--- a/kimap.spec
+++ b/kimap.spec
@@ -16,18 +16,22 @@
 #
 
 
-%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:           kimap
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        KDE PIM Libraries: IMAP library
 License:        LGPL-2.1-or-later
 Group:          System/GUI/KDE
 URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+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:  cyrus-sasl-devel
 BuildRequires:  extra-cmake-modules >= 5.19.0
 BuildRequires:  kf5-filesystem
@@ -36,10 +40,6 @@ BuildRequires:  cmake(KF5I18n) >= %{kf5_version}
 BuildRequires:  cmake(KF5KIO) >= %{kf5_version}
 BuildRequires:  cmake(KF5Mime)
 BuildRequires:  cmake(Qt5Test)
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 KIMAP provides libraries to interface and communicate with
@@ -70,7 +70,7 @@ applications.
 %lang_package
 
 %prep
-%setup -q -n kimap-%{version}
+%autosetup -p1 -n kimap-%{version}
 
 %build
   %global _lto_cflags %{_lto_cflags} -ffat-lto-objects
@@ -88,9 +88,9 @@ applications.
 
 %files -n libKF5IMAP5
 %license LICENSES/*
-%{_kf5_libdir}/libKF5IMAP.so.*
 %{_kf5_debugdir}/*.categories
 %{_kf5_debugdir}/*.renamecategories
+%{_kf5_libdir}/libKF5IMAP.so.*
 
 %files devel
 %license LICENSES/*