From bf64937b139e3084ac40d6ba944fd69dedef697f4763dea01fd9bc556ca0529a Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 4 Jul 2022 18:09:33 +0000 Subject: [PATCH] Accepting request 986649 from home:bnavigator:branches:devel:languages:python:mailman - Go back to Python 3.9 for mailman. Python 3.10 is not supported and it is unclear whether the test failures are due to the production code or only in the setup of aiosmtpd in the test suite. -- https://gitlab.com/mailman/mailman/-/issues/936 OBS-URL: https://build.opensuse.org/request/show/986649 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman?expand=0&rev=64 --- python-mailman.changes | 8 ++++ python-mailman.rpmlintrc | 4 +- python-mailman.spec | 101 ++++++++++++++++++--------------------- 3 files changed, 58 insertions(+), 55 deletions(-) diff --git a/python-mailman.changes b/python-mailman.changes index cf950ef..434e150 100644 --- a/python-mailman.changes +++ b/python-mailman.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jul 4 13:14:27 UTC 2022 - Ben Greiner + +- Go back to Python 3.9 for mailman. Python 3.10 is not supported + and it is unclear whether the test failures are due to the + production code or only in the setup of aiosmtpd in the test + suite. -- https://gitlab.com/mailman/mailman/-/issues/936 + ------------------------------------------------------------------- Wed Jun 29 18:14:25 UTC 2022 - Lars Vogdt diff --git a/python-mailman.rpmlintrc b/python-mailman.rpmlintrc index af7090f..228ee8b 100644 --- a/python-mailman.rpmlintrc +++ b/python-mailman.rpmlintrc @@ -1,2 +1,4 @@ addFilter("incoherent-logrotate-file /etc/logrotate.d/mailman") -addFilter("zero-length /usr/lib/python3.6/site-packages/mailman/templates/.*") +addFilter("zero-length /usr/lib/python3../site-packages/mailman/templates/.*") +addFilter("obsolete-not-provided python3-mailman") +addFilter("explicit-lib-dependency python3.*-passlib") \ No newline at end of file diff --git a/python-mailman.spec b/python-mailman.spec index 95b5fc1..5e3598e 100644 --- a/python-mailman.spec +++ b/python-mailman.spec @@ -34,8 +34,17 @@ %define psuffix %{nil} %bcond_with test %endif +%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 mypython python39 +%define mypython_sitelib %{python39_sitelib} +%else %{?!python_module:%define python_module() python3-%{**}} %define pythons python3 +%define mypython python3 +%define mypython_sitelib %{python3_sitelib} +%endif Name: python-mailman%{psuffix} Version: 3.3.5 Release: 0 @@ -74,39 +83,17 @@ Patch3: ARC-message-fail-tests.patch Patch4: mailman-support-sqlalchemy-1-4.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes +BuildRequires: python-rpm-macros +%if 0%{?suse_version} >= 1550 +# use the real python3 primary for rpm pythondistdeps.py +BuildRequires: python3-packaging +%endif BuildArch: noarch %if %{with test} -BuildRequires: %{python_module SQLAlchemy >= 1.2.3} -BuildRequires: %{python_module aiosmtpd >= 1.1} -BuildRequires: %{python_module alembic} -BuildRequires: %{python_module atpublic} -BuildRequires: %{python_module authheaders >= 0.9.2} -BuildRequires: %{python_module authres >= 1.0.1} -BuildRequires: %{python_module click >= 7.0} -BuildRequires: %{python_module dnspython >= 1.14.0} -BuildRequires: %{python_module falcon > 3.0.0} -BuildRequires: %{python_module flufl.bounce >= 4.0} -BuildRequires: %{python_module flufl.i18n >= 3.2} -BuildRequires: %{python_module flufl.lock >= 5.1} BuildRequires: %{python_module flufl.testing} -BuildRequires: %{python_module gunicorn} -BuildRequires: %{python_module importlib-resources >= 1.1.0} -BuildRequires: %{python_module lazr.config} -BuildRequires: %{python_module mailman >= %{version}} BuildRequires: %{python_module nose2} -BuildRequires: %{python_module passlib} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module python-dateutil >= 2.0} -BuildRequires: %{python_module requests} -BuildRequires: %{python_module zope.component} -BuildRequires: %{python_module zope.configuration} -BuildRequires: %{python_module zope.event} -BuildRequires: %{python_module zope.interface >= 5.0} -%endif -%if 0%{python3_version_nodots} == 38 -# help in replacing any previously installed multiflavor package back to the primary python3 package -Provides: python38-mailman = %{version}-%{release} -Obsoletes: python38-mailman <= %{version}-%{release} +BuildRequires: mailman3 = %{version} %endif %description @@ -114,35 +101,40 @@ Mailman is a mailing list manager from the GNU project. %package -n mailman3 Summary: A mailing list manager +Requires: %{mypython}-SQLAlchemy >= 1.2.3 +Requires: %{mypython}-aiosmtpd >= 1.4.1 +Requires: %{mypython}-alembic +Requires: %{mypython}-atpublic +Requires: %{mypython}-authheaders >= 0.9.2 +Requires: %{mypython}-authres >= 1.0.1 +Requires: %{mypython}-click >= 7.0 +Requires: %{mypython}-dnspython >= 1.14.0 +Requires: %{mypython}-falcon > 3.0.0 +Requires: %{mypython}-flufl.bounce >= 4.0 +Requires: %{mypython}-flufl.i18n >= 3.2 +Requires: %{mypython}-flufl.lock >= 5.1 +Requires: %{mypython}-gunicorn +Requires: %{mypython}-importlib-resources >= 1.1.0 +Requires: %{mypython}-lazr.config +Requires: %{mypython}-passlib +Requires: %{mypython}-python-dateutil >= 2.0 +Requires: %{mypython}-requests +Requires: %{mypython}-setuptools +Requires: %{mypython}-zope.component +Requires: %{mypython}-zope.configuration +Requires: %{mypython}-zope.event +Requires: %{mypython}-zope.interface >= 5.0 Requires: logrotate -Requires: python3-SQLAlchemy >= 1.2.3 -Requires: python3-aiosmtpd >= 1.4.1 -Requires: python3-alembic -Requires: python3-atpublic -Requires: python3-authheaders >= 0.9.2 -Requires: python3-authres >= 1.0.1 -Requires: python3-click >= 7.0 -Requires: python3-dnspython >= 1.14.0 -Requires: python3-falcon > 3.0.0 -Requires: python3-flufl.bounce >= 4.0 -Requires: python3-flufl.i18n >= 3.2 -Requires: python3-flufl.lock >= 5.1 -Requires: python3-gunicorn -Requires: python3-importlib-resources >= 1.1.0 -Requires: python3-lazr.config -Requires: python3-passlib -Requires: python3-python-dateutil >= 2.0 -Requires: python3-requests -Requires: python3-setuptools -Requires: python3-zope.component -Requires: python3-zope.configuration -Requires: python3-zope.event -Requires: python3-zope.interface >= 5.0 Requires(post): update-alternatives Requires(postun):update-alternatives Provides: mailman = %{version} -Provides: python3-mailman = %{version} -Obsoletes: python3-mailman <= %{version} +%if "%{expand:%%%{mypython}_provides}" == "python3" +Provides: python3-mailman = %{version}-%{release} +%endif +Obsoletes: python3-mailman < %{version}-%{release} +# help in replacing any previously installed multiflavor package back to the unprefixed package +Provides: %{mypython}-mailman = %{version}-%{release} +Obsoletes: %{mypython}-mailman < %{version}-%{release} %description -n mailman3 Mailman is a mailing list manager from the GNU project. @@ -257,7 +249,8 @@ getent passwd %{mailman_user} >/dev/null || \ %{_bindir}/runner %{_bindir}/mailman %{_bindir}/master -%{python_sitelib}/* +%{mypython_sitelib}/mailman +%{mypython_sitelib}/mailman-%{version}*-info %{_unitdir}/%{mailman_name}.service %{_unitdir}/%{mailman_name}-digests.service %{_unitdir}/%{mailman_name}-digests.timer