# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1346173325 -7200
# Node ID 08b1736686fa9b20643a3e7d0288eaf0cd2e25ff
# Parent  561e962f5a6ea496cea64f92f6694dfe6811cd6d
Update version, adjust patch code accordingly, and modernize packaging.

diff -r 561e962f5a6e -r 08b1736686fa mailman/mailman.patch
--- a/mailman/mailman.patch	Tue Aug 28 19:02:00 2012 +0200
+++ b/mailman/mailman.patch	Tue Aug 28 19:02:05 2012 +0200
@@ -73,7 +73,7 @@
 Index: Mailman/Handlers/Scrubber.py
 --- Mailman/Handlers/Scrubber.py.orig	2009-02-23 22:23:35 +0100
 +++ Mailman/Handlers/Scrubber.py	2009-03-27 11:55:18 +0100
-@@ -368,6 +368,8 @@
+@@ -371,6 +371,8 @@
                      t = unicode(t, 'ascii', 'replace')
                  try:
                      # Should use HTML-Escape, or try generalizing to UTF-8
@@ -82,23 +82,12 @@
                      t = t.encode(charset, 'replace')
                  except (UnicodeError, LookupError, ValueError,
                          AssertionError):
-Index: Mailman/Queue/OutgoingRunner.py
---- Mailman/Queue/OutgoingRunner.py.orig	2009-02-23 22:23:35 +0100
-+++ Mailman/Queue/OutgoingRunner.py	2009-03-27 11:55:18 +0100
-@@ -89,6 +89,7 @@
-                 syslog('error', 'Cannot connect to SMTP server %s on port %s',
-                        mm_cfg.SMTPHOST, port)
-                 self.__logged = True
-+            self._snooze(0)
-             return True
-         except Errors.SomeRecipientsFailed, e:
-             # Handle local rejects of probe messages differently.
 Index: Mailman/htmlformat.py
 --- Mailman/htmlformat.py.orig	2009-02-23 22:23:35 +0100
 +++ Mailman/htmlformat.py	2009-03-27 11:55:18 +0100
-@@ -300,7 +300,8 @@
+@@ -302,7 +302,8 @@
          charset = 'us-ascii'
-         if self.language:
+         if self.language and Utils.IsLanguage(self.language):
              charset = Utils.GetCharSet(self.language)
 -        output = ['Content-Type: text/html; charset=%s\n' % charset]
 +        output = ['Content-Type: text/html; charset=%s' % charset]
diff -r 561e962f5a6e -r 08b1736686fa mailman/mailman.spec
--- a/mailman/mailman.spec	Tue Aug 28 19:02:00 2012 +0200
+++ b/mailman/mailman.spec	Tue Aug 28 19:02:05 2012 +0200
@@ -41,8 +41,8 @@
 Class:        EVAL
 Group:        Mail
 License:      GPL
-Version:      2.1.14
-Release:      20120208
+Version:      2.1.15
+Release:      20120800
 
 #   list of sources
 Source0:      http://ftp.gnu.org/gnu/mailman/mailman-%{version}.tgz
@@ -53,12 +53,8 @@
 Patch0:       mailman.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20060823, python, make
-PreReq:       OpenPKG, openpkg >= 20060823, python, MTA
-AutoReq:      no
-AutoReqProv:  no
+BuildPreReq:  OpenPKG, openpkg >= 20100101, python, make
+PreReq:       OpenPKG, openpkg >= 20100101, python, MTA
 
 %description
     Mailman is software to help manage email discussion lists, much
@@ -110,7 +106,6 @@
 
 %install
     #   install package
-    rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT DIRSETGID=true
 
     #   create additional directories
@@ -191,7 +186,6 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT
 
 %post
     #   add hook to MTA configuration