From 366eea1d6b0ebf338f29a35fbeb6dbca04f347c9 Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Oct 18 2023 22:49:36 +0000
Subject: Merge branch f37 into epel9-next


---

diff --git a/.gitignore b/.gitignore
index a833a94..98a3ba8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,18 @@
 /kmail-22.04.0.tar.xz
 /kmail-22.04.1.tar.xz
 /kmail-22.04.1.tar.xz
+/kmail-22.04.3.tar.xz
+/kmail-22.08.0.tar.xz
+/kmail-22.08.1.tar.xz
+/kmail-22.08.2.tar.xz
+/kmail-22.08.3.tar.xz
+/kmail-22.12.0.tar.xz
+/kmail-22.12.1.tar.xz
+/kmail-22.12.2.tar.xz
 /kmail-22.12.3.tar.xz
+/kmail-23.03.80.tar.xz
+/kmail-23.03.90.tar.xz
+/kmail-23.04.0.tar.xz
+/kmail-23.04.1.tar.xz
+/kmail-23.04.2.tar.xz
+/kmail-23.04.3.tar.xz
diff --git a/kmail-use-older-gpgme.patch b/kmail-use-older-gpgme.patch
deleted file mode 100644
index d516b89..0000000
--- a/kmail-use-older-gpgme.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From eb7c3055b2501247763fbc278fcfb21811112bcf Mon Sep 17 00:00:00 2001
-From: Troy Dawson <tdawson@redhat.com>
-Date: Mon, 22 May 2023 12:52:24 -0700
-Subject: [PATCH] use older gpgme
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2ff3003..b34b8b4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -84,7 +84,7 @@ find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)
- set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://invent.kde.org/pim/akonadi-search" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
- 
--set(GPGMEPP_LIB_VERSION "1.16.0")
-+set(GPGMEPP_LIB_VERSION "1.15.1")
- find_package(Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
- 
- # Find KF5 package
--- 
-2.39.1
-
diff --git a/kmail.spec b/kmail.spec
index 69ec50d..1c80b91 100644
--- a/kmail.spec
+++ b/kmail.spec
@@ -7,8 +7,8 @@
 
 Name:    kmail
 Summary: Mail client
-Version: 22.12.3
-Release: 2%{?dist}.1
+Version: 23.04.3
+Release: 2%{?dist}
 
 # code (generally) GPLv2, docs GFDL
 License: GPLv2 and GFDL
@@ -27,10 +27,6 @@ Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name
 
 ## upstream patches (lookaside cache)
 
-# RHEL 9 only has gpgme version 1.15.1
-# Although the config says it need 1.16, it does not really need it
-Patch0:         kmail-use-older-gpgme.patch
-
 BuildRequires: boost-devel
 BuildRequires: cmake(Gpgmepp) cmake(QGpgme)
 BuildRequires: desktop-file-utils
@@ -69,6 +65,7 @@ BuildRequires: cmake(KF5NotifyConfig)
 BuildRequires: cmake(KF5Parts)
 BuildRequires: cmake(KF5Service)
 BuildRequires: cmake(KF5Sonnet)
+BuildRequires: cmake(KF5TextAutoCorrection)
 BuildRequires: cmake(KF5TextWidgets)
 BuildRequires: cmake(KF5WindowSystem)
 BuildRequires: cmake(KF5XmlGui)
@@ -226,11 +223,26 @@ end
 
 
 %changelog
-* Thu Aug 24 2023 Troy Dawson <tdawson@redhat.com> - 22.12.3-2.1
-- Rebuild for newer libraries.
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 23.04.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jul 08 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.04.3-1
+- 23.04.3
+
+* Tue Jun 06 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.04.2-1
+- 23.04.2
+
+* Sat May 13 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.04.1-1
+- 23.04.1
+
+* Fri Apr 14 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.04.0-1
+- 23.04.0
+
+* Fri Mar 31 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.03.90-1
+- 23.03.90
 
-* Mon May 22 2023 Troy Dawson <tdawson@redhat.com> - 22.12.3-1.1
-- Use older gpgme
+* Mon Mar 20 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.03.80-1
+- 23.03.80
 
 * Thu Mar 02 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 22.12.3-1
 - 22.12.3
diff --git a/sources b/sources
index d5a3e68..d77f07c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kmail-22.12.3.tar.xz) = 4aad8a3985e0773e4c9d5f302cea1e2b5f91028c936ac2b631a973e06f6d661e4714d125fbbb1acb6c1b3d4cde1d05cea1d74689c1aa45ce0903d35c27f20bbd
+SHA512 (kmail-23.04.3.tar.xz) = d79a037bac71824c6e38d6e171901d8331b07073c3c03098c39886fc1642ff529bfad18d97020c67bf6caccdd78116d4f5f159a03b765dadcb3808148d30d575