--- rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/04/21 06:47:45	1.2
+++ rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/04/26 14:16:06	1.9
@@ -1,4 +1,4 @@
-# $Id: smeserver-fetchmail.spec,v 1.1 2008/04/21 06:32:29 slords Exp $
+# $Id: smeserver-fetchmail.spec,v 1.8 2008/04/26 09:43:32 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 1
+%define release 7
 %define smepanel FetchMails
 Version: %{version}
 Release: %{release}%{?dist}
@@ -14,6 +14,10 @@ License: GPL
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: smeserver-release >= 7.3  
@@ -21,9 +25,28 @@ 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
+* 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
+
+* Mon Apr 21 2008 Shad L. Lords <slords@mail.com> 1.3.6-2.sme
+- Remove duplicate translation entries
+
 * Sun Apr 20 2008 Shad L. Lords <slords@mail.com> 1.3.6-1.sme
 - Cleanup tar file.  Prepare for import to buildsys.
 
@@ -177,6 +200,10 @@ sme server enhancement to make fetchmail
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks
@@ -192,9 +219,5 @@ echo "%doc COPYING"          >> %{name}-
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/bin/mv -f /etc/e-smith/Light_0.jpg /etc/e-smith/web/common/
-/bin/mv -f /etc/e-smith/Light_1.jpg /etc/e-smith/web/common/
-
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)