diff --git a/fix-test-avoid-duplicates.patch b/fix-test-avoid-duplicates.patch new file mode 100644 index 0000000000000000000000000000000000000000..d808892868dfcb30596bcb9a0c6c8f63a5e45d32 --- /dev/null +++ b/fix-test-avoid-duplicates.patch @@ -0,0 +1,22 @@ +diff -Naur mailman-3.3.8.old/src/mailman/handlers/avoid_duplicates.py mailman-3.3.8/src/mailman/handlers/avoid_duplicates.py +--- mailman-3.3.8.old/src/mailman/handlers/avoid_duplicates.py 2024-11-21 18:16:07.577599400 +0800 ++++ mailman-3.3.8/src/mailman/handlers/avoid_duplicates.py 2024-11-21 18:16:22.776160000 +0800 +@@ -113,7 +113,3 @@ + newrecips.add(r) + # Set the new list of recipients. XXX recips should always be a set. + msgdata['recipients'] = list(newrecips) +- # RFC 2822 specifies zero or one CC header +- del msg['cc'] +- if cc_addresses: +- msg['CC'] = COMMASPACE.join(cc_addresses.values()) +diff -Naur mailman-3.3.8.old/src/mailman/handlers/docs/avoid-duplicates.rst mailman-3.3.8/src/mailman/handlers/docs/avoid-duplicates.rst +--- mailman-3.3.8.old/src/mailman/handlers/docs/avoid-duplicates.rst 2024-11-21 18:16:07.474111000 +0800 ++++ mailman-3.3.8/src/mailman/handlers/docs/avoid-duplicates.rst 2024-11-21 18:18:04.372763800 +0800 +@@ -96,6 +96,7 @@ + ['bperson@example.com'] + >>> print(msg.as_string()) + From: Claire Person ++ CC: aperson@example.com + + Something of great import. + diff --git a/mailman.spec b/mailman.spec index b0097e397909ab42d84a7cb1f2894b762e385a31..dd6defd373ed4ff9d4106c79a1880cb369d90cd6 100644 --- a/mailman.spec +++ b/mailman.spec @@ -7,7 +7,7 @@ Name: mailman Version: 3.3.8 -Release: 2 +Release: 3 Epoch: 3 Summary: The GNU mailing list manager License: GPLv3 @@ -21,6 +21,7 @@ Source5: mailman3-digests.service Source6: mailman3-digests.timer Patch0001: mailman-subject-prefix.patch Patch0002: mailman-use-either-importlib_resources-or-directly-importlib.patch +Patch0003: fix-test-avoid-duplicates.patch BuildArch: noarch BuildRequires: glibc-langpack-en BuildRequires: python%{python3_pkgversion}-devel >= 3.5 python%{python3_pkgversion}-setuptools @@ -205,6 +206,9 @@ done %{_datadir}/selinux/*/mailman3.pp %changelog +* Thu Nov 21 2024 zhangxianjun - 3:3.3.8-3 +- fix check error in test_cc_with_header_instance + * Mon Dec 25 2023 wangkai <13474090681@163.com> - 3:3.3.8-2 - Fix install error due to flufl.i18n,flufl.lock upgrade