From 0b884b806082697860c6496e5160af8bdd7dfe1f8a96d38c4d43704ee5b78fe4 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sat, 28 Jul 2018 13:35:01 +0000
Subject: [PATCH 1/2] KDE Applications 18.08.0 beta (third time's the charm)

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kimap?expand=0&rev=100
---
 kimap-18.04.3.tar.xz  |  3 ---
 kimap-18.07.80.tar.xz |  3 +++
 kimap.changes         | 15 +++++++++++++++
 kimap.spec            |  6 ++----
 4 files changed, 20 insertions(+), 7 deletions(-)
 delete mode 100644 kimap-18.04.3.tar.xz
 create mode 100644 kimap-18.07.80.tar.xz

diff --git a/kimap-18.04.3.tar.xz b/kimap-18.04.3.tar.xz
deleted file mode 100644
index eaf5eab..0000000
--- a/kimap-18.04.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2cb8db33df147524dc34cc48d54243d1c336f68db3f742082cefa5a46c37648e
-size 119332
diff --git a/kimap-18.07.80.tar.xz b/kimap-18.07.80.tar.xz
new file mode 100644
index 0000000..b3f568e
--- /dev/null
+++ b/kimap-18.07.80.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:531970c19157591e8fe334cbcf92d12905eccc7d7b7c4441e3f8b416cf268fc9
+size 119704
diff --git a/kimap.changes b/kimap.changes
index 788a117..a6d951e 100644
--- a/kimap.changes
+++ b/kimap.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Jul 26 13:00:44 UTC 2018 - lbeltrame@kde.org
+
+- Update to 18.07.80
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-18.07.80.php
+- Changes since 18.04.3:
+  * Fix merging
+  * USe Q_REQUIRED_RESULT
+  * Fix minor typos
+  * LOGIN: remove deprecated encryption options
+  * Add proper error message when STARTTLS is not supported
+  * LoginJob: add Q_FALLTHROUGH
+
 -------------------------------------------------------------------
 Fri Jul 13 04:49:58 UTC 2018 - lbeltrame@kde.org
 
diff --git a/kimap.spec b/kimap.spec
index 1cea6f2..9597309 100644
--- a/kimap.spec
+++ b/kimap.spec
@@ -20,11 +20,11 @@
 
 %define kf5_version 5.19.0
 Name:           kimap
-Version:        18.04.3
+Version:        18.07.80
 Release:        0
 %define kf5_version 5.26.0
 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
-%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
+%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 Summary:        KDE PIM Libraries: IMAP library
 License:        LGPL-2.1-or-later
 Group:          System/GUI/KDE
@@ -67,9 +67,7 @@ Requires:       libKF5IMAP5 = %{version}
 This package contains development headers to add IMAP support to PIM
 applications.
 
-%if %{with lang}
 %lang_package
-%endif
 
 %prep
 %setup -q -n kimap-%{version}

From cb24300e12a5b7d9d6d4a74f527e739f8a07db95aa59300c1abfa6c6472edb7d Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sat, 18 Aug 2018 11:02:02 +0000
Subject: [PATCH 2/2] Update to 18.08.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kimap?expand=0&rev=101
---
 kimap-18.07.80.tar.xz |  3 ---
 kimap-18.08.0.tar.xz  |  3 +++
 kimap.changes         | 10 ++++++++++
 kimap.spec            |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)
 delete mode 100644 kimap-18.07.80.tar.xz
 create mode 100644 kimap-18.08.0.tar.xz

diff --git a/kimap-18.07.80.tar.xz b/kimap-18.07.80.tar.xz
deleted file mode 100644
index b3f568e..0000000
--- a/kimap-18.07.80.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:531970c19157591e8fe334cbcf92d12905eccc7d7b7c4441e3f8b416cf268fc9
-size 119704
diff --git a/kimap-18.08.0.tar.xz b/kimap-18.08.0.tar.xz
new file mode 100644
index 0000000..b9efe79
--- /dev/null
+++ b/kimap-18.08.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8769fe7531265bdfdfa4ae3fd5aa8d035582b53e4597ea98c2b569e6fa59a8a
+size 119688
diff --git a/kimap.changes b/kimap.changes
index a6d951e..61c5853 100644
--- a/kimap.changes
+++ b/kimap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Aug 16 22:04:34 UTC 2018 - christophe@krop.fr
+
+- Update to 18.08.0
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-18.08.0.php
+- Changes since 18.07.80:
+  * None
+
 -------------------------------------------------------------------
 Thu Jul 26 13:00:44 UTC 2018 - lbeltrame@kde.org
 
diff --git a/kimap.spec b/kimap.spec
index 9597309..0755f8b 100644
--- a/kimap.spec
+++ b/kimap.spec
@@ -20,7 +20,7 @@
 
 %define kf5_version 5.19.0
 Name:           kimap
-Version:        18.07.80
+Version:        18.08.0
 Release:        0
 %define kf5_version 5.26.0
 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)