--- rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/04/21 07:09:19	1.3
+++ rpms/smeserver-fetchmail/contribs7/smeserver-fetchmail.spec	2008/04/24 17:54:40	1.7
@@ -1,4 +1,4 @@
-# $Id: smeserver-fetchmail.spec,v 1.2 2008/04/21 06:47:45 slords Exp $
+# $Id: smeserver-fetchmail.spec,v 1.6 2008/04/24 16:05:23 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 2
+%define release 5
 %define smepanel FetchMails
 Version: %{version}
 Release: %{release}%{?dist}
@@ -15,6 +15,7 @@ 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: smeserver-release >= 7.3  
@@ -22,9 +23,19 @@ 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
+* 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
 
@@ -182,6 +193,7 @@ sme server enhancement to make fetchmail
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
@@ -197,9 +209,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)