--- rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/04/21 20:16:16	1.4
+++ rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2011/04/27 16:47:26	1.32
@@ -1,4 +1,4 @@
-# $Id: smeserver-fetchmail.spec,v 1.3 2008/04/21 07:09:19 slords Exp $
+# $Id: smeserver-fetchmail.spec,v 1.31 2011/03/06 15:27:31 slords Exp $
 # Authority: ???
 # Name: Pascal Schirrmann
 
@@ -6,7 +6,7 @@ Summary: sme module to generate fetchmai
 %define name smeserver-fetchmail
 Name: %{name}
 %define version 1.3.6
-%define release 3
+%define release 24
 %define smepanel FetchMails
 Version: %{version}
 Release: %{release}%{?dist}
@@ -15,16 +15,101 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-fetchmail-1.3.6-createlnks.patch
 Patch1: smeserver-fetchmail-1.3.6-duplocale.patch
+Patch2: smeserver-fetchmail-1.3.6-locale-2008-04-24.patch
+Patch3: smeserver-fetchmail-1.3.6-locale-2008-04-26.patch
+Patch4: smeserver-fetchmail-1.3.6-add2general.patch
+Patch5: smeserver-fetchmail-1.3.6-locale-2008-04-27.patch
+Patch6: smeserver-fetchmail-1.3.6-locale-2008-07-01.patch
+Patch7: smeserver-fetchmail-1.3.6-locale-2008-10-14.patch
+Patch8: smeserver-fetchmail-1.3.6-locale-2008-11-05.patch
+Patch9: smeserver-fetchmail-1.3.6-locale-2009-01-01.patch
+Patch10: smeserver-fetchmail-1.3.6-locale-2009-01-31.patch
+Patch11: smeserver-fetchmail-1.3.6-locale-2009-03-01.patch
+Patch12: smeserver-fetchmail-1.3.6-locale-2009-03-03.patch
+Patch13: smeserver-fetchmail-1.3.6-domainlength.patch
+Patch14: smeserver-fetchmail-1.3.6-erroronexpandtemplate.patch
+Patch15: smeserver-fetchmail-1.3.6-locale-2009-04-07.patch
+Patch16: smeserver-fetchmail-1.3.6-locale-2009-04-27.patch
+Patch17: smeserver-fetchmail-1.3.6-locale-2009-08-24.patch
+Patch18: smeserver-fetchmail-1.3.6-locale-2009-10-21.patch
+Patch19: smeserver-fetchmail-1.3.6-locale-2010-03-02.patch
+Patch20: smeserver-fetchmail-1.3.6-locale-2011-03-06.patch
+Patch21: smeserver-fetchmail-1.3.6-locale-2011-04-27.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: smeserver-release >= 7.3  
 Requires: e-smith-email >= 4.16.0-18
-Requires: e-smith-formmagick >= 1.4.0-10
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: sme-fetchmail
+Obsoletes: smeserver-fetchmail-utf8
 AutoReqProv: no
 
 %changelog
+* Wed Apr 27 2011 SME Translation Server <translations@contribs.org> 1.3.6-24.sme
+- apply locale 2011-04-27 patch
+
+* Sun Mar 06 2011 SME Translation Server <translations@contribs.org> 1.3.6-23.sme
+- apply locale 2011-03-06 patch
+
+* Tue Mar 02 2010 SME Translation Server <translations@contribs.org> 1.3.6-22.sme
+- apply locale 2010-03-02 patch
+
+* Wed Oct 21 2009 SME Translation Server <translations@contribs.org> 1.3.6-21.sme
+- apply locale 2009-10-21 patch
+
+* Mon Aug 24 2009 SME Translation Server <translations@contribs.org> 1.3.6-20.sme
+- apply locale 2009-08-24 patch
+
+* Mon Apr 27 2009 SME Translation Server <translations@contribs.org> 1.3.6-19.sme
+- apply locale 2009-04-27 patch
+
+* Tue Apr  7 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-18
+- Fix error during template expansion [SME: 5147]
+- Apply 7 Apr 2009 locale patch
+
+* Thu Mar 5 2009 Shad L. Lords <slords@mail.com> 1.3.6-17
+- Fix domainlength issues [SME: 5037]
+
+* Tue Mar 03 2009 SME Translation Server
+- apply locale 2009-03-03 patch
+
+* Sun Mar  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-15
+- Apply  1 Mar 2009 locale patch [SME: 5018]
+
+* Sat Jan 31 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-14
+- Apply 31 Jan 2009 locale patch [SME: 4951]
+
+* Thu Jan  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-13
+- Apply  1 Jan 2009 locale patch [SME: 4900]
+
+* Wed Nov  5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-12
+- Apply  5 Nov 2008 locale patch
+
+* Tue Oct 14 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-11
+- Apply 14 Oct 2008 locale patch
+
+* Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-10
+- Apply 1 July 2008 locale patch
+
+* Mon May 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-9
+- Apply 5 May 2008 locale patch
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-8
+- Add common <base> tags to e-smith-formmagick's general to other locales
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-7
+- Add common <base> tags to e-smith-formmagick's general
+
+* Sat Apr 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-6
+- Added da locale patch
+
+* Thu Apr 24 2008 Shad L. Lords <slords@mail.com> 1.3.6-5
+- update locale to Apr-24-2008 version (fix fr/de/it translations)
+
+* Tue Apr 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-4
+- Added locale patch
+
 * Mon Apr 21 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.3.6-3
 - Removed %post macro as instructions were irrelevant and caused errors
 
@@ -185,6 +270,26 @@ sme server enhancement to make fetchmail
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%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
 
 %build
 perl createlinks