--- rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2008/04/27 17:26:49	1.18
+++ rpms/smeserver-mailsorting/contribs7/smeserver-mailsorting.spec	2009/05/20 18:16:27	1.38
@@ -1,4 +1,4 @@
-# $Id: smeserver-mailsorting.spec,v 1.17 2008/04/22 15:30:00 snetram Exp $
+# $Id: smeserver-mailsorting.spec,v 1.37 2009/04/27 16:11:21 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 19
+%define release 34
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -23,11 +23,26 @@ Patch6: smeserver-mailsorting-1.2-geekmo
 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
+Patch12: smeserver-mailsorting-1.2-locale-2008-07-01.patch
+Patch13: smeserver-mailsorting-1.2-locale-2008-09-27.patch
+Patch14: smeserver-mailsorting-1.2-76Filter.patch
+Patch15: smeserver-mailsorting-1.2-removefwd.patch
+Patch16: smeserver-mailsorting-1.2-locale-2008-10-14.patch
+Patch17: smeserver-mailsorting-1.2-locale-2009-01-01.patch
+Patch18: smeserver-mailsorting-1.2-zarafaprocmail.patch
+Patch19: smeserver-mailsorting-1.2-removedropdown.patch
+Patch20: smeserver-mailsorting-1.2-locale-2009-03-01.patch
+Patch21: smeserver-mailsorting-1.2-locale-2009-03-03.patch
+Patch22: smeserver-mailsorting-1.2-sortOrder.patch
+Patch23: smeserver-mailsorting-1.2-locale-2009-04-27.patch
+Patch24: smeserver-mailsorting-1.2-locale-2009-05-20.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
@@ -37,6 +52,52 @@ SME Server enhancement to enable procmai
 Optionally provides user panels where users can create mail rules for themselves
 
 %changelog
+* Wed May 20 2009 SME Translation Server <translations@contribs.org> 1.2-34.sme
+- apply locale 2009-05-20 patch
+
+* Mon Apr 27 2009 SME Translation Server <translations@contribs.org> 1.2-33.sme
+- apply locale 2009-04-27 patch
+
+* Sun Mar 22 2009 Stephen Noble <support@dungog.net> 1.2-32
+-  qmail FilterOrder enabled lets maildrop filter before forwarding [SME: 5044]
+
+* Tue Mar 03 2009 SME Translation Server  xyz   1.2-31
+- apply locale 2009-03-03 patch
+
+* Sun Mar  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-30
+- Apply  1 Mar 2009 locale patch [SME: 5018]
+
+* Sat Feb 21 2009 Stephen Noble <support@dungog.net> 1.2-29
+- remove drop down to select folders [SME: 5016]
+
+* Sat Feb 21 2009 Stephen Noble <support@dungog.net> 1.2-28
+- procmail sort to zarafa folders if enabled [SME: 5016]
+
+* Thu Jan  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-27
+- Apply  1 Jan 2009 locale patch [SME: 4900]
+
+* Tue Oct 14 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-26
+- Apply 14 Oct 2008 locale patch
+
+* Mon Sep 29 2008 Stephen Noble <support@dungog.net> - 1.2-25
+- remove internal forwarding [SME: 4605]
+
+* Sat Sep 27 2008 Stephen Noble <support@dungog.net> - 1.2-24
+- move .qmail fragment after SME forwarding [SME: 4602]
+
+* Sat Sep 27 2008 Stephen Noble <support@dungog.net> - 1.2-23
+- Apply 27 Sep 2008 locale patch
+
+* Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2-22
+- Apply 1 July 2008 locale patch
+
+* 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
 
@@ -154,6 +215,21 @@ Optionally provides user panels where us
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %build
 perl createlinks