--- rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2008/04/22 15:30:00	1.17
+++ rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2008/05/05 19:22:37	1.20
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailsorting.spec,v 1.16 2008/04/02 15:03:57 slords Exp $
+# $Id: smeserver-mailsorting.spec,v 1.19 2008/04/28 23:21:44 slords Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
@@ -6,7 +6,7 @@ Summary: Lets users configure procmail o
 %define name smeserver-mailsorting
 Name: %{name}
 %define version 1.2
-%define release 18
+%define release 10
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,11 +22,13 @@ Patch5: smeserver-mailsorting-1.2-locale
 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
 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
@@ -36,6 +38,12 @@ SME Server enhancement to enable procmai
 Optionally provides user panels where users can create mail rules for themselves
 
 %changelog
+* 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
 
@@ -149,6 +157,8 @@ Optionally provides user panels where us
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 perl createlinks