--- rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2009/03/05 15:47:54	1.25
+++ rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2009/04/07 12:48:23	1.26
@@ -1,4 +1,4 @@
-# $Id: smeserver-fetchmail.spec,v 1.24 2009/03/05 15:47:12 slords Exp $
+# $Id: smeserver-fetchmail.spec,v 1.25 2009/03/05 15:47:54 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 17
+%define release 18
 %define smepanel FetchMails
 Version: %{version}
 Release: %{release}%{?dist}
@@ -27,6 +27,8 @@ Patch10: smeserver-fetchmail-1.3.6-local
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: smeserver-release >= 7.3  
@@ -38,6 +40,10 @@ Obsoletes: smeserver-fetchmail-utf8
 AutoReqProv: no
 
 %changelog
+* 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]
 
@@ -252,6 +258,8 @@ sme server enhancement to make fetchmail
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 perl createlinks