From 66b1ece2ea1c48c0b4a0b855d9cc2a5373839a2843e7173d0976491982120969 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 18 Jan 2022 21:34:18 +0000 Subject: [PATCH 1/4] Accepting request 947161 from home:pgajdos - rename python3-mailman package to mailman3 [bsc#1194497] OBS-URL: https://build.opensuse.org/request/show/947161 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman?expand=0&rev=56 --- python-mailman.changes | 5 +++++ python-mailman.spec | 27 +++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/python-mailman.changes b/python-mailman.changes index 646ee0d..661f774 100644 --- a/python-mailman.changes +++ b/python-mailman.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 18 08:28:16 UTC 2022 - pgajdos@suse.com + +- rename python3-mailman package to mailman3 [bsc#1194497] + ------------------------------------------------------------------- Wed Nov 17 08:15:44 UTC 2021 - Andreas Schneider diff --git a/python-mailman.spec b/python-mailman.spec index 529da67..3ab7e7f 100644 --- a/python-mailman.spec +++ b/python-mailman.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,7 +39,7 @@ Name: python-mailman%{psuffix} Version: 3.3.5 Release: 0 -Summary: A mailing list manager +Summary: A Mailing List Manager Group: Productivity/Networking/Email/Mailinglists License: GPL-3.0-only URL: https://www.list.org @@ -136,6 +136,14 @@ Obsoletes: python38-mailman < %{version}-%{release} %description Mailman is a mailing list manager from the GNU project. +%package -n mailman3 +Summary: A mailing list manager +Provides: python3-mailman = %{version} +Obsoletes: python3-mailman < %{version} + +%description -n mailman3 +Mailman is a mailing list manager from the GNU project. + %prep %autosetup -p1 -n mailman-%{version} @@ -220,7 +228,7 @@ sed -i "s:\(902\):4\1:" src/mailman/testing/testing.cfg %endif %if !%{with test} -%pre +%pre -n mailman3 getent group %{mailman_group} >/dev/null || \ %{_sbindir}/groupadd -r %{mailman_group} getent passwd %{mailman_user} >/dev/null || \ @@ -229,38 +237,33 @@ getent passwd %{mailman_user} >/dev/null || \ %{_sbindir}/usermod -g %{mailman_group} %{mailman_user} >/dev/null %service_add_pre %{mailman_services} -%post +%post -n mailman3 %tmpfiles_create %{_tmpfilesdir}/%{mailman_name}.conf %service_add_post %{mailman_services} -%preun +%preun -n mailman3 %service_del_preun %{mailman_services} -%postun +%postun -n mailman3 %service_del_postun %{mailman_services} -%files %{python_files} +%files -n mailman3 %doc README.rst README.SUSE.md %license COPYING %{_sbindir}/rc%{mailman_name}* - %{_bindir}/runner %{_bindir}/mailman %{_bindir}/master %{python_sitelib}/* - %{_unitdir}/%{mailman_name}.service %{_unitdir}/%{mailman_name}-digests.service %{_unitdir}/%{mailman_name}-digests.timer %{_unitdir}/%{mailman_name}-notify.service %{_unitdir}/%{mailman_name}-notify.timer %{_tmpfilesdir}/%{mailman_name}.conf - %config(noreplace) %attr(640,root,mailman) %{_sysconfdir}/mailman.cfg %config(noreplace) %{_sysconfdir}/logrotate.d/%{mailman_name} - %dir %attr(750,root,mailman) %{_sysconfdir}/%{mailman_name}.d - %dir %attr(750,mailman,mailman) %{mailman_homedir} %dir %attr(750,mailman,mailman) %{mailman_homedir}/data %dir %attr(750,mailman,mailman) %{mailman_spooldir} From a9bdef1a277247ca2e8e949287472a2341a72faf19992d859dcd02f611a7fd97 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 19 Jan 2022 20:35:59 +0000 Subject: [PATCH 2/4] - Add patch ARC-message-fail-tests.patch which allows four tests to pass with different format of the output. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman?expand=0&rev=57 --- ARC-message-fail-tests.patch | 46 ++++++++++++++++++++++++++++++++++++ python-mailman.changes | 6 +++++ python-mailman.spec | 3 +++ 3 files changed, 55 insertions(+) create mode 100644 ARC-message-fail-tests.patch diff --git a/ARC-message-fail-tests.patch b/ARC-message-fail-tests.patch new file mode 100644 index 0000000..b705a62 --- /dev/null +++ b/ARC-message-fail-tests.patch @@ -0,0 +1,46 @@ +--- + src/mailman/handlers/tests/test_arc_validate.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +--- a/src/mailman/handlers/tests/test_arc_validate.py ++++ b/src/mailman/handlers/tests/test_arc_validate.py +@@ -192,7 +192,7 @@ This is a test message. + ValidateAuthenticity().process(lst, msg, msgdata) + res = ["lists.example.org; spf=pass smtp.mfrom=jqd@d1.example" + "; dkim=pass header.i=@d1.example; dmarc=pass; arc=fail"] +- self.assertEqual(msg["Authentication-Results"], ''.join(res)) ++ self.assertIn(''.join(res), msg["Authentication-Results"]) + + def test_authentication_whitelist_hit(self): + config.push('just_dkim', """ +@@ -235,7 +235,7 @@ This is a test! + + res = ["example.com; spf=pass smtp.mailfrom=gmail.com" + "; dkim=pass header.d=valimail.com; arc=none"] +- self.assertEqual(msg["Authentication-Results"], ''.join(res)) ++ self.assertIn(''.join(res), msg["Authentication-Results"]) + + def test_authentication_whitelist_miss(self): + config.push('just_dkim', """ +@@ -276,8 +276,8 @@ This is a test! + """) + + ValidateAuthenticity().process(lst, msg, msgdata) +- self.assertEqual(msg["Authentication-Results"], +- "test.com; dkim=pass header.d=valimail.com; arc=none") ++ self.assertIn("test.com; dkim=pass header.d=valimail.com; arc=none", ++ msg["Authentication-Results"]) + + def test_authentication_bad_outlook_header(self): + config.push('just_dkim', """ +@@ -320,8 +320,8 @@ This is a test! + """) + + ValidateAuthenticity().process(lst, msg, msgdata) +- self.assertEqual(msg["Authentication-Results"], +- "test.com; dkim=fail header.d=valimail.com; arc=none") ++ self.assertIn("test.com; dkim=fail header.d=valimail.com; arc=none", ++ msg["Authentication-Results"]) + + + class TestTimeout(unittest.TestCase): diff --git a/python-mailman.changes b/python-mailman.changes index 661f774..4464301 100644 --- a/python-mailman.changes +++ b/python-mailman.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 19 20:26:32 UTC 2022 - Matej Cepl + +- Add patch ARC-message-fail-tests.patch which allows four tests + to pass with different format of the output. + ------------------------------------------------------------------- Tue Jan 18 08:28:16 UTC 2022 - pgajdos@suse.com diff --git a/python-mailman.spec b/python-mailman.spec index 3ab7e7f..6c61d82 100644 --- a/python-mailman.spec +++ b/python-mailman.spec @@ -67,6 +67,9 @@ Patch1: support-sqlalchemy-1-4.patch # Suppprt Alembic 1.7.x Patch2: support-alembic-1-7.patch # +# PATCH-FIX-UPSTREAM ARC-message-fail-tests.patch bsc#[0-9]+ mcepl@suse.com +# this patch makes things totally awesome +Patch3: ARC-message-fail-tests.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros From a74ded2f50d1f8c8d01978da7bd8a81a0570ff32d06acff59f5a3756bd6423b5 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 20 Jan 2022 10:39:17 +0000 Subject: [PATCH 3/4] Obsolete itself as well. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman?expand=0&rev=58 --- python-mailman.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-mailman.spec b/python-mailman.spec index 6c61d82..208f45e 100644 --- a/python-mailman.spec +++ b/python-mailman.spec @@ -132,7 +132,7 @@ BuildRequires: %{python_module zope.interface >= 5.0} %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} +Obsoletes: python38-mailman <= %{version}-%{release} %endif %python_subpackages From 373549e0d857b40861cc894c9ee1c85bdc37e3179518756f0b0409c6dc7635a5 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 20 Jan 2022 11:11:39 +0000 Subject: [PATCH 4/4] Accepting request 947665 from home:pgajdos - fix obsoletes OBS-URL: https://build.opensuse.org/request/show/947665 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:mailman/python-mailman?expand=0&rev=59 --- python-mailman.changes | 5 +++++ python-mailman.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python-mailman.changes b/python-mailman.changes index 4464301..f679fe6 100644 --- a/python-mailman.changes +++ b/python-mailman.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 20 11:05:31 UTC 2022 - pgajdos@suse.com + +- fix obsoletes + ------------------------------------------------------------------- Wed Jan 19 20:26:32 UTC 2022 - Matej Cepl diff --git a/python-mailman.spec b/python-mailman.spec index 208f45e..08465cb 100644 --- a/python-mailman.spec +++ b/python-mailman.spec @@ -142,7 +142,7 @@ Mailman is a mailing list manager from the GNU project. %package -n mailman3 Summary: A mailing list manager Provides: python3-mailman = %{version} -Obsoletes: python3-mailman < %{version} +Obsoletes: python3-mailman <= %{version} %description -n mailman3 Mailman is a mailing list manager from the GNU project.