--- rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/04/26 09:43:32	1.8
+++ rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/06/27 20:35:28	1.14
@@ -1,4 +1,4 @@
-# $Id: smeserver-fetchmail.spec,v 1.7 2008/04/24 17:54:40 slords Exp $
+# $Id: smeserver-fetchmail.spec,v 1.13 2008/05/05 19:14:26 snetram 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 6
+%define release 9
 %define smepanel FetchMails
 Version: %{version}
 Release: %{release}%{?dist}
@@ -17,17 +17,28 @@ Patch0: smeserver-fetchmail-1.3.6-create
 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
 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
+* 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
 
@@ -199,6 +210,8 @@ sme server enhancement to make fetchmail
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks