--- rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2008/03/08 02:47:49	1.10
+++ rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2008/03/14 10:02:46	1.14
@@ -2,7 +2,7 @@ Summary: Lets users configure procmail o
 %define name smeserver-mailsorting
 Name: %{name}
 %define version 1.2
-%define release 12
+%define release 16
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,10 +13,15 @@ Patch0: smeserver-mailsorting-1.2-maildr
 Patch1: smeserver-mailsorting-1.2-esLocale.patch
 Patch2: smeserver-mailsorting-1.2-frLocale3.patch
 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
+
 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:  smeserver-userpanel, userpanel causes endless problems
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
@@ -26,7 +31,19 @@ SME Server enhancement to enable procmai
 Optionally provides user panels where users can create mail rules for themselves
 
 %changelog
-* Sat Mar 07 2008 Stephen Noble <support@dungog.net> - 1.2.12
+* 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
+
+* Wed Mar 12 2008 Shad L. Lords <slords@mail.com> - 1.2-14
+- Add requires for e-smith-formmagick for UTF-8 support [SME: 3858]
+
+* Tue Mar 11 2008 Stephen Noble <support@dungog.net> - 1.2-13
+- Add 2008-03-11 locale patch
+
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> - 1.2-12
 - prepare en lexicons for pootle translations
 
 * Tue Dec 25 2007 Stephen Noble <support@dungog.net> 1.2-11
@@ -116,12 +133,14 @@ Optionally provides user panels where us
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
 
 LEXICONS=$(find root/etc/e-smith/{locale/,web/functions/} -type f )
-
 for lexicon in $LEXICONS
 do
     /sbin/e-smith/validate-lexicon $lexicon