From bf1e8fe2eeed912ec4464cd221a35e5baad90924358770e622648c829cbdc8db Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 2 Jul 2022 07:10:08 +0000
Subject: [PATCH] Accepting request 986328 from home:gladiac:mailman3

- Fix django warning that timeout is bigger than retry
  * Added hyperkitty-fix-qcluster-timeout.patch

OBS-URL: https://build.opensuse.org/request/show/986328
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-HyperKitty?expand=0&rev=54
---
 hyperkitty-fix-qcluster-timeout.patch | 24 ++++++++++++++++++++++++
 python-HyperKitty.changes             |  6 ++++++
 python-HyperKitty.spec                |  3 +++
 3 files changed, 33 insertions(+)
 create mode 100644 hyperkitty-fix-qcluster-timeout.patch

diff --git a/hyperkitty-fix-qcluster-timeout.patch b/hyperkitty-fix-qcluster-timeout.patch
new file mode 100644
index 0000000..b219bae
--- /dev/null
+++ b/hyperkitty-fix-qcluster-timeout.patch
@@ -0,0 +1,24 @@
+From 3edc0c58b8dea3b0bdccd77c0794ada28d1c6f61 Mon Sep 17 00:00:00 2001
+From: Mark Sapiro <mark@msapiro.net>
+Date: Sun, 5 Dec 2021 00:32:33 +0000
+Subject: [PATCH] Set Q_CLUSTER retry > timeout.
+
+---
+ example_project/settings.py | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/example_project/settings.py b/example_project/settings.py
+index a6e90441..5aca0186 100644
+--- a/example_project/settings.py
++++ b/example_project/settings.py
+@@ -368,6 +368,7 @@ REST_FRAMEWORK = {
+ #
+ Q_CLUSTER = {
+     'timeout': 300,
++    'retry': 360,
+     'save_limit': 100,
+     'orm': 'default',
+ }
+-- 
+GitLab
+
diff --git a/python-HyperKitty.changes b/python-HyperKitty.changes
index 2f105e3..44b699f 100644
--- a/python-HyperKitty.changes
+++ b/python-HyperKitty.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jul  2 06:12:09 UTC 2022 - Andreas Schneider <asn@cryptomilk.org>
+
+- Fix django warning that timeout is bigger than retry
+  * Added hyperkitty-fix-qcluster-timeout.patch
+
 -------------------------------------------------------------------
 Fri Jun 10 08:14:18 UTC 2022 - Andreas Schneider <asn@cryptomilk.org>
 
diff --git a/python-HyperKitty.spec b/python-HyperKitty.spec
index 0c95a1d..603b986 100644
--- a/python-HyperKitty.spec
+++ b/python-HyperKitty.spec
@@ -63,6 +63,8 @@ Patch1:         hyperkitty-fix-mistune-2.0-imports.patch
 Patch2:         hyperkitty-django4.patch
 # https://gitlab.com/mailman/hyperkitty/-/issues/429
 Patch3:         python-HyperKitty-no-mock.patch
+# https://gitlab.com/mailman/hyperkitty/-/commit/3edc0c58b8dea3b0bdccd77c0794ada28d1c6f61
+Patch4:         hyperkitty-fix-qcluster-timeout.patch
 #
 BuildRequires:  %{python_module django-debug-toolbar >= 2.2}
 BuildRequires:  %{python_module isort}
@@ -162,6 +164,7 @@ rsync -a example_project/* build_static_files
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 sed -i 's|^#!/usr/bin/env.*|#!%{_bindir}/python3|' \