rpms/mailman/devel mailman-2.1.11-footer.patch, NONE, 1.1 mailman.spec, 1.73, 1.74

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/mailman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16103

Modified Files:
	mailman.spec 
Added Files:
	mailman-2.1.11-footer.patch 
Log Message:

fix #460820 - msg_footer gets its trailing spaces trimmed


mailman-2.1.11-footer.patch:

--- NEW FILE mailman-2.1.11-footer.patch ---
diff -up mailman-2.1.11/Mailman/Handlers/Decorate.py.footer mailman-2.1.11/Mailman/Handlers/Decorate.py
--- mailman-2.1.11/Mailman/Handlers/Decorate.py.footer	2008-10-29 08:41:59.000000000 +0100
+++ mailman-2.1.11/Mailman/Handlers/Decorate.py	2008-10-29 08:43:28.000000000 +0100
@@ -227,7 +227,8 @@ def decorate(mlist, template, what, extr
         template = Utils.to_percent(template)
     # Interpolate into the template
     try:
-        text = re.sub(r' *\r?\n', r'\n', template % d)
+        text = re.sub(r'(?m)(?<!^--) +(?=\n)', '',
+                      re.sub(r'\r\n', r'\n', template % d))
     except (ValueError, TypeError), e:
         syslog('error', 'Exception while calculating %s:\n%s', what, e)
         what = what.upper()


Index: mailman.spec
===================================================================
RCS file: /cvs/extras/rpms/mailman/devel/mailman.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- mailman.spec	31 Jul 2008 12:18:04 -0000	1.73
+++ mailman.spec	29 Oct 2008 07:53:15 -0000	1.74
@@ -1,7 +1,7 @@
 Summary: Mailing list manager with built in Web access
 Name: mailman
 Version: 2.1.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 3
 Group: Applications/Internet
 #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz
@@ -27,6 +27,7 @@
 Patch12: mailman-2.1.9-selinux.patch
 Patch13: mailman-2.1.9-unicode.patch
 Patch14: mailman-2.1.11-fhsinit.patch
+Patch15: mailman-2.1.11-footer.patch
 
 License: GPLv2+
 URL: http://www.list.org/
@@ -109,6 +110,7 @@
 %patch12 -p1 -b .selinux
 %patch13 -p1 -b .unicode
 %patch14 -p1 -b .fhsinit
+%patch15 -p1 -b .footer
 
 #cp $RPM_SOURCE_DIR/mailman.INSTALL.REDHAT.in INSTALL.REDHAT.in
 cp %{SOURCE5} INSTALL.REDHAT.in
@@ -354,6 +356,9 @@
 %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in
 
 %changelog
+* Wed Oct 29 2008 Daniel Novotny <dnovotny at redhat.com> 3:2.1.11-4
+  fix #460820 - msg_footer gets its trailing spaces trimmed
+
 * Thu Jul 31 2008 Tomas Smetana <tsmetana at redhat.com> - 3:2.1.11-3
 - fix #457388 - don't call "/usr/bin/python" from /etc/cron.d/mailman
 - fix #457389 - cron complains about bad username