--- rpms/smeserver-mailman/contribs7/smeserver-mailman.spec	2008/04/23 15:54:39	1.4
+++ rpms/smeserver-mailman/contribs7/smeserver-mailman.spec	2008/05/21 20:17:45	1.12
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailman.spec,v 1.3 2008/04/22 15:27:00 snetram Exp $
+# $Id: smeserver-mailman.spec,v 1.11 2008/05/05 19:20:53 snetram 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 17
+%define release 22
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -25,11 +25,17 @@ Patch9: smeserver-mailman-1.3.0-alias2ma
 Patch10: smeserver-mailman-1.3.0-smelist.patch2
 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
+Patch17: smeserver-mailman-1.3.0-locale-2008-05-21.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
@@ -39,10 +45,27 @@ AutoReqProv: no
 Add Mailman integration to the SME server.
 
 %changelog
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-22
+- Apply 21 May 2008 locale patch
+- Fixed version number in previous changelog entry
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-21
+- 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
+
 * Wed Apr 23 2008 Daniel B. <daniel@firewall-services.com> 1.3.0-17
-- fix path for the archives (/var instead of /usr)
+- Fix path for the archives [SME: 4252]
 
-* Sun Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.0-16
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.0-16
 - Added 22 April 2008 locale patch
 
 * Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
@@ -211,6 +234,11 @@ Add Mailman integration to the SME serve
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 /bin/rm -r root/opt/mailman