--- rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2008/03/14 09:47:13	1.13
+++ rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2008/05/22 21:00:47	1.22
@@ -1,8 +1,12 @@
+# $Id: smeserver-mailsorting.spec,v 1.21 2008/05/21 20:20:27 snetram Exp $
+# Authority: dungog
+# Name: Stephen Noble
+
 Summary: Lets users configure procmail or maildrop rules.
 %define name smeserver-mailsorting
 Name: %{name}
 %define version 1.2
-%define release 15
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,12 +19,17 @@ Patch2: smeserver-mailsorting-1.2-frLoca
 Patch3: smeserver-mailsorting-1.2-pootle.patch
 Patch4: smeserver-mailsorting-1.2-locale-2008-03-11.patch
 Patch5: smeserver-mailsorting-1.2-locale-2008-03-14.patch
-
+Patch6: smeserver-mailsorting-1.2-geekmode.patch
+Patch7: smeserver-mailsorting-1.2-locale-2008-04-01.patch
+Patch8: smeserver-mailsorting-1.2-locale-2008-04-22.patch
+Patch9: smeserver-mailsorting-1.2-add2general.patch
+Patch10: smeserver-mailsorting-1.2-locale-2008-05-05.patch
+Patch11: smeserver-mailsorting-1.2-locale-2008-05-21.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires:  e-smith-release >= 7.0,
 Requires: perl-Unicode-IMAPUtf7
-Requires: e-smith-formmagick >= 1.4.0-10
+Requires: e-smith-formmagick >= 1.4.0-12
 #Requires:  smeserver-userpanel, userpanel causes endless problems
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
@@ -30,6 +39,25 @@ SME Server enhancement to enable procmai
 Optionally provides user panels where users can create mail rules for themselves
 
 %changelog
+* Thu May 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-21
+- Apply 21 May 2008 locale patch
+- Updating the release number (it was lagging behind about 10)
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-20
+- Apply 5 May 2008 locale patch
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-19
+- Add common <base> tags to e-smith-formmagick's general
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-18
+- Added 22 April 2008 locale patch
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 1.2-17
+- Update to UTF-8 translations
+
+* Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.2-16
+- block generation of procmail/maildrop rules [SME: 4051]
+
 * Fri Mar 14 2008 Stephen Noble <support@dungog.net> - 1.2-15
 - update locale 2008-03-14
 
@@ -131,6 +159,12 @@ Optionally provides user panels where us
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 perl createlinks