From eedefcebf1a735a49a6c3bed4bfc735f1653778de9a388a4ab42554ac9211c70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= <mmachova@suse.com>
Date: Tue, 27 Jun 2023 08:02:31 +0000
Subject: [PATCH] Accepting request 1095513 from
 devel:languages:python:mailman:backports

Update to version 1.2.1 and use python 3.11

OBS-URL: https://build.opensuse.org/request/show/1095513
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman-hyperkitty?expand=0&rev=16
---
 mailman-hyperkitty-1.2.0.tar.gz         |  3 ---
 mailman-hyperkitty-1.2.1.tar.gz         |  3 +++
 python-mailman-hyperkitty-no-mock.patch | 13 -------------
 python-mailman-hyperkitty.changes       |  7 +++++++
 python-mailman-hyperkitty.spec          | 13 ++++++-------
 5 files changed, 16 insertions(+), 23 deletions(-)
 delete mode 100644 mailman-hyperkitty-1.2.0.tar.gz
 create mode 100644 mailman-hyperkitty-1.2.1.tar.gz
 delete mode 100644 python-mailman-hyperkitty-no-mock.patch

diff --git a/mailman-hyperkitty-1.2.0.tar.gz b/mailman-hyperkitty-1.2.0.tar.gz
deleted file mode 100644
index 111ed31..0000000
--- a/mailman-hyperkitty-1.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:110071d4a5f7cff5afdd00073a2facfe284b3a3a62ba9210058c84e883db26da
-size 21794
diff --git a/mailman-hyperkitty-1.2.1.tar.gz b/mailman-hyperkitty-1.2.1.tar.gz
new file mode 100644
index 0000000..92e5213
--- /dev/null
+++ b/mailman-hyperkitty-1.2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8d69dfbc6ccb582896d40a9a69457aa1075cdd6efbc55d34c797024b40bcc38
+size 22197
diff --git a/python-mailman-hyperkitty-no-mock.patch b/python-mailman-hyperkitty-no-mock.patch
deleted file mode 100644
index 77e3cdc..0000000
--- a/python-mailman-hyperkitty-no-mock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mailman-hyperkitty-1.2.0/mailman_hyperkitty/tests/test_archiver.py
-===================================================================
---- mailman-hyperkitty-1.2.0.orig/mailman_hyperkitty/tests/test_archiver.py
-+++ mailman-hyperkitty-1.2.0/mailman_hyperkitty/tests/test_archiver.py
-@@ -32,7 +32,7 @@ from textwrap import dedent
- from unittest import TestCase
- 
- import requests
--from mock import Mock, patch
-+from unittest.mock import Mock, patch
- from mailman.config import config
- from mailman.email.message import Message
- from mailman.testing.layers import ConfigLayer
diff --git a/python-mailman-hyperkitty.changes b/python-mailman-hyperkitty.changes
index 7a8f874..f6b2e8a 100644
--- a/python-mailman-hyperkitty.changes
+++ b/python-mailman-hyperkitty.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 26 20:31:18 UTC 2023 - Andreas Schneider <asn@cryptomilk.org>
+
+- Update to version 1.2.1
+- Use sle15_python_module_pythons
+- Removed python-mailman-hyperkitty-no-mock.patch
+
 -------------------------------------------------------------------
 Mon Jul  4 11:12:24 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-mailman-hyperkitty.spec b/python-mailman-hyperkitty.spec
index f227b12..14a6aac 100644
--- a/python-mailman-hyperkitty.spec
+++ b/python-mailman-hyperkitty.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-mailman-hyperkitty
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,21 +18,20 @@
 
 %if 0%{?suse_version} >= 1550
 # Newest python supported by mailman is Python 3.9 -- https://gitlab.com/mailman/mailman/-/issues/936
-%define pythons python39
+%define pythons python311
 %else
-%{?!python_module:%define python_module() python3-%{**}}
-%define pythons python3
+%{?sle15_python_module_pythons}
+%define pythons python311
 %endif
 Name:           python-mailman-hyperkitty
-Version:        1.2.0
+Version:        1.2.1
 Release:        0
 Summary:        Mailman archiver plugin for HyperKitty
 License:        GPL-3.0-only
 URL:            https://gitlab.com/mailman/mailman-hyperkitty/
 Source:         https://files.pythonhosted.org/packages/source/m/mailman-hyperkitty/mailman-hyperkitty-%{version}.tar.gz
 # https://gitlab.com/mailman/mailman-hyperkitty/-/issues/28
-Patch0:         python-mailman-hyperkitty-no-mock.patch
-Patch1:         python-mailman-hyperkitty-fix-archiver-test.patch
+Patch0:         python-mailman-hyperkitty-fix-archiver-test.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros