--- rpms/smeserver-mailman/contribs7/smeserver-mailman.spec	2008/04/23 18:32:01	1.7
+++ rpms/smeserver-mailman/contribs7/smeserver-mailman.spec	2008/05/05 19:20:53	1.11
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailman.spec,v 1.6 2008/04/23 16:55:28 vip-ire Exp $
+# $Id: smeserver-mailman.spec,v 1.10 2008/04/28 23:21:44 slords Exp $
 # Authority: gordonr
 # Name: Gordon Rowell
 
@@ -6,7 +6,7 @@ Summary: Mailman configuration for SME s
 %define name smeserver-mailman
 Name: %{name}
 %define version 1.3.0
-%define release 18
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -26,11 +26,15 @@ Patch10: smeserver-mailman-1.3.0-smelist
 Patch11: smeserver-mailman-1.3.0-locale-2008-04-22.patch
 Patch12: smeserver-mailman-1.3.0-archives.patch
 Patch13: smeserver-mailman-1.3.0-locale-2008-04-23.patch
+Patch14: smeserver-mailman-1.3.0-locale-2008-04-26.patch
+Patch15: smeserver-mailman-1.3.0-add2general.patch
+Patch16: smeserver-mailman-1.3.0-locale-2008-05-05.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
 Requires: e-smith-release >= 7.0
 Requires: mailman >= 2.1.5.1-34.rhel4.3sme01
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: e-smith-mailman
 Provides: e-smith-mailman
@@ -40,6 +44,15 @@ AutoReqProv: no
 Add Mailman integration to the SME server.
 
 %changelog
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-9
+- Apply 5 May 2008 locale patch
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.0-20
+- Add common <base> tags to e-smith-formmagick's general
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.0-19
+- Added 26 April 2008 locale patch
+
 * Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.0-18
 - Added 23 April 2008 locale patch
 - Fixed changelog
@@ -217,6 +230,9 @@ Add Mailman integration to the SME serve
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 /bin/rm -r root/opt/mailman