Tue, 28 Aug 2012 19:02:05 +0200
Update version, adjust patch code accordingly, and modernize packaging.
mailman/mailman.patch | file | annotate | diff | comparison | revisions | |
mailman/mailman.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/mailman/mailman.patch Tue Aug 28 19:02:00 2012 +0200 1.2 +++ b/mailman/mailman.patch Tue Aug 28 19:02:05 2012 +0200 1.3 @@ -73,7 +73,7 @@ 1.4 Index: Mailman/Handlers/Scrubber.py 1.5 --- Mailman/Handlers/Scrubber.py.orig 2009-02-23 22:23:35 +0100 1.6 +++ Mailman/Handlers/Scrubber.py 2009-03-27 11:55:18 +0100 1.7 -@@ -368,6 +368,8 @@ 1.8 +@@ -371,6 +371,8 @@ 1.9 t = unicode(t, 'ascii', 'replace') 1.10 try: 1.11 # Should use HTML-Escape, or try generalizing to UTF-8 1.12 @@ -82,23 +82,12 @@ 1.13 t = t.encode(charset, 'replace') 1.14 except (UnicodeError, LookupError, ValueError, 1.15 AssertionError): 1.16 -Index: Mailman/Queue/OutgoingRunner.py 1.17 ---- Mailman/Queue/OutgoingRunner.py.orig 2009-02-23 22:23:35 +0100 1.18 -+++ Mailman/Queue/OutgoingRunner.py 2009-03-27 11:55:18 +0100 1.19 -@@ -89,6 +89,7 @@ 1.20 - syslog('error', 'Cannot connect to SMTP server %s on port %s', 1.21 - mm_cfg.SMTPHOST, port) 1.22 - self.__logged = True 1.23 -+ self._snooze(0) 1.24 - return True 1.25 - except Errors.SomeRecipientsFailed, e: 1.26 - # Handle local rejects of probe messages differently. 1.27 Index: Mailman/htmlformat.py 1.28 --- Mailman/htmlformat.py.orig 2009-02-23 22:23:35 +0100 1.29 +++ Mailman/htmlformat.py 2009-03-27 11:55:18 +0100 1.30 -@@ -300,7 +300,8 @@ 1.31 +@@ -302,7 +302,8 @@ 1.32 charset = 'us-ascii' 1.33 - if self.language: 1.34 + if self.language and Utils.IsLanguage(self.language): 1.35 charset = Utils.GetCharSet(self.language) 1.36 - output = ['Content-Type: text/html; charset=%s\n' % charset] 1.37 + output = ['Content-Type: text/html; charset=%s' % charset]
2.1 --- a/mailman/mailman.spec Tue Aug 28 19:02:00 2012 +0200 2.2 +++ b/mailman/mailman.spec Tue Aug 28 19:02:05 2012 +0200 2.3 @@ -41,8 +41,8 @@ 2.4 Class: EVAL 2.5 Group: Mail 2.6 License: GPL 2.7 -Version: 2.1.14 2.8 -Release: 20120208 2.9 +Version: 2.1.15 2.10 +Release: 20120800 2.11 2.12 # list of sources 2.13 Source0: http://ftp.gnu.org/gnu/mailman/mailman-%{version}.tgz 2.14 @@ -53,12 +53,8 @@ 2.15 Patch0: mailman.patch 2.16 2.17 # build information 2.18 -Prefix: %{l_prefix} 2.19 -BuildRoot: %{l_buildroot} 2.20 -BuildPreReq: OpenPKG, openpkg >= 20060823, python, make 2.21 -PreReq: OpenPKG, openpkg >= 20060823, python, MTA 2.22 -AutoReq: no 2.23 -AutoReqProv: no 2.24 +BuildPreReq: OpenPKG, openpkg >= 20100101, python, make 2.25 +PreReq: OpenPKG, openpkg >= 20100101, python, MTA 2.26 2.27 %description 2.28 Mailman is software to help manage email discussion lists, much 2.29 @@ -110,7 +106,6 @@ 2.30 2.31 %install 2.32 # install package 2.33 - rm -rf $RPM_BUILD_ROOT 2.34 %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT DIRSETGID=true 2.35 2.36 # create additional directories 2.37 @@ -191,7 +186,6 @@ 2.38 %files -f files 2.39 2.40 %clean 2.41 - rm -rf $RPM_BUILD_ROOT 2.42 2.43 %post 2.44 # add hook to MTA configuration