--- rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/04/22 08:52:51	1.5
+++ rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/04/28 19:53:53	1.11
@@ -1,4 +1,4 @@
-# $Id: smeserver-fetchmail.spec,v 1.4 2008/04/21 20:16:16 snetram Exp $
+# $Id: smeserver-fetchmail.spec,v 1.10 2008/04/27 18:35:34 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 4
+%define release 7
 %define smepanel FetchMails
 Version: %{version}
 Release: %{release}%{?dist}
@@ -15,7 +15,10 @@ 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-22.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  
@@ -23,9 +26,22 @@ Requires: e-smith-email >= 4.16.0-18
 Requires: e-smith-formmagick >= 1.4.0-10
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: sme-fetchmail
+Obsoletes: smeserver-fetchmail-utf8
 AutoReqProv: no
 
 %changelog
+* 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
 
@@ -190,6 +206,9 @@ sme server enhancement to make fetchmail
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks