Accepting request 1140796 from home:mcalabkova:branches:openSUSE:Backports:SLE-15-SP6:mailman

- Add patch find-flufl.patch to fix the tests with recent flufl.*
- Don't require importlib-resources on new Pythons, they are already 
  a part of a standard library

OBS-URL: https://build.opensuse.org/request/show/1140796
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman?expand=0&rev=90
This commit is contained in:
Andreas Schneider 2024-01-23 10:20:07 +00:00 committed by Git OBS Bridge
parent e28ada2a2b
commit bdb98f9fc5
3 changed files with 44 additions and 1 deletions

30
find-flufl.patch Normal file
View File

@ -0,0 +1,30 @@
Index: mailman-3.3.9/setup.py
===================================================================
--- mailman-3.3.9.orig/setup.py
+++ mailman-3.3.9/setup.py
@@ -119,8 +119,8 @@ case second 'm'. Any other spelling is
'dnspython>=1.14.0',
'falcon>=3.0.0',
'flufl.bounce>=4.0',
- 'flufl.i18n>=3.2',
- 'flufl.lock>=5.1',
+ 'flufl-i18n>=3.2',
+ 'flufl_lock>=5.1',
'gunicorn',
'lazr.config',
'python-dateutil>=2.0',
Index: mailman-3.3.9/src/mailman.egg-info/requires.txt
===================================================================
--- mailman-3.3.9.orig/src/mailman.egg-info/requires.txt
+++ mailman-3.3.9/src/mailman.egg-info/requires.txt
@@ -7,8 +7,8 @@ click>=8.0.0
dnspython>=1.14.0
falcon>=3.0.0
flufl.bounce>=4.0
-flufl.i18n>=3.2
-flufl.lock>=5.1
+flufl-i18n>=3.2
+flufl_lock>=5.1
gunicorn
lazr.config
python-dateutil>=2.0

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jan 23 09:56:40 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Add patch find-flufl.patch to fix the tests with recent flufl.*
- Don't require importlib-resources on new Pythons, they are already
a part of a standard library
-------------------------------------------------------------------
Mon Nov 6 00:27:43 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>

View File

@ -86,6 +86,10 @@ Source31: python-mailman.rpmlintrc
Source100: https://gitlab.com/mailman/mailman/-/raw/master/src/mailman/testing/ssl_test_cert.crt
Source101: https://gitlab.com/mailman/mailman/-/raw/master/src/mailman/testing/ssl_test_key.key
#
# PATCH-FIX-OPENSUSE mmachova@suse.com based on upstream merge request https://gitlab.com/mailman/mailman/-/merge_requests/1123
# it won't be needed with new releases of flufl.lock and flufl.i18n, because the issue was fixed in pdm upstream https://github.com/pdm-project/pdm/pull/2057
Patch0: find-flufl.patch
#
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@ -119,7 +123,6 @@ Requires: %{mypython}-flufl.bounce >= %{flufl_bounce_min_version}
Requires: %{mypython}-flufl.i18n >= %{flufl_i18n_min_version}
Requires: %{mypython}-flufl.lock >= %{flufl_lock_min_version}
Requires: %{mypython}-gunicorn
Requires: %{mypython}-importlib-resources >= 1.1.0
Requires: %{mypython}-lazr.config
Requires: %{mypython}-passlib
Requires: %{mypython}-psycopg2
@ -138,6 +141,9 @@ Provides: mailman = %{version}
%if "%{expand:%%%{mypython}_provides}" == "python3"
Provides: python3-mailman = %{version}-%{release}
%endif
%if %{expand:%%%{mypython}_version_nodots} < 39
Requires: %{mypython}-importlib-resources >= 1.1.0
%endif
Obsoletes: python3-mailman < %{version}-%{release}
# help in replacing any previously installed multiflavor package back to the unprefixed package
Provides: %{mypython}-mailman = %{version}-%{release}