From cb4000b79c91051d945b6b3cc37520fbfe9a5a4e Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Feb 15 2021 23:20:18 +0000
Subject: Apply latest upstream commit for previous patch to be in sync with Clawsker.


---

diff --git a/claws-mail-3.17.8-socket-tmpdir.patch b/claws-mail-3.17.8-socket-tmpdir.patch
index 48819a2..b42add8 100644
--- a/claws-mail-3.17.8-socket-tmpdir.patch
+++ b/claws-mail-3.17.8-socket-tmpdir.patch
@@ -1,17 +1,36 @@
-diff -Naur claws-mail-3.17.8-orig/src/main.c claws-mail-3.17.8/src/main.c
---- claws-mail-3.17.8-orig/src/main.c	2020-10-19 12:37:56.000000000 +0200
-+++ claws-mail-3.17.8/src/main.c	2021-01-16 20:49:20.094227916 +0100
-@@ -2305,12 +2305,7 @@
+From e56346845c2a23ec1fd0abc32b7c1598766333dd Mon Sep 17 00:00:00 2001
+From: Michael Rasmussen <mir@datanom.net>
+Date: Sat, 16 Jan 2021 20:08:58 +0100
+Subject: [PATCH] use g_get_user_runtime_dir for claws-mail socket dir instead
+ of g_tmp_dir
+
+Signed-off-by: Michael Rasmussen <mir@datanom.net>
+---
+ src/main.c | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index ff5bd38a0..0de3de86f 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -2304,14 +2304,9 @@ gchar *claws_get_socket_name(void)
+ 		GStatBuf st;
  		gint stat_ok;
  
- 		socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
+-		socket_dir = g_strdup_printf("%s%cclaws-mail-%d",
 -					   g_get_tmp_dir(), G_DIR_SEPARATOR,
 -#if HAVE_GETUID
 -					   getuid());
 -#else
 -					   0);
 -#endif
-+                                     g_get_user_runtime_dir(), G_DIR_SEPARATOR);
- 		stat_ok = g_stat(socket_dir, &st);
+-		stat_ok = g_stat(socket_dir, &st);
++		socket_dir = g_strdup_printf("%s%cclaws-mail",
++                                    g_get_user_runtime_dir(), G_DIR_SEPARATOR);
++        stat_ok = g_stat(socket_dir, &st);
  		if (stat_ok < 0 && errno != ENOENT) {
  			g_print("Error stat'ing socket_dir %s: %s\n",
+ 				socket_dir, g_strerror(errno));
+-- 
+2.25.1
+
diff --git a/claws-mail.spec b/claws-mail.spec
index ae33a07..bf279dc 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -23,7 +23,7 @@ Obsoletes: claws-mail-plugins-python < 3.17.4-1
 
 Name:           claws-mail
 Version:        3.17.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Email client and news reader based on GTK+
 License:        GPLv3+
 URL:            http://claws-mail.org
@@ -662,6 +662,9 @@ touch -r NEWS %{buildroot}%{_includedir}/%{name}/config.h
 
 
 %changelog
+* Mon Feb 15 2021 Michael Schwendt <mschwendt@fedoraproject.org> - 3.17.8-4
+- Apply latest upstream commit for previous patch to be in sync with Clawsker.
+
 * Mon Feb 15 2021 Michael Schwendt <mschwendt@fedoraproject.org> - 3.17.8-3
 - Patch to use g_get_user_runtime_dir() instead of g_get_tmp_dir()