--- rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/04 09:43:40	1.42
+++ rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/04 22:34:30	1.45
@@ -1,10 +1,10 @@
-# $Id: smeserver-locale.spec,v 1.41 2008/10/04 07:56:24 snetram Exp $
+# $Id: smeserver-locale.spec,v 1.44 2008/10/04 15:38:05 snetram Exp $
 
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
 %define version 1.4.0
-%define release 18
+%define release 20
 %define package_summary SME Server localisation module
 %define group Applications/System
 %define package_locales bg da de el es fr hu id it nl pt pt_BR sl sv tr
@@ -26,8 +26,7 @@ Patch10: smeserver-locale-1.4.0-locale-2
 Patch11: smeserver-locale-1.4.0-locale-2008-09-27.patch
 Patch12: smeserver-locale-1.4.0-locale-2008-09-30.patch
 Patch13: smeserver-locale-1.4.0-locale-2008-10-03.patch
-Patch14: smeserver-locale-1.4.0-removeReferrencesToWiki.patch
-Patch15: smeserver-locale-1.4.0-removeColorCoding.patch
+Patch14: smeserver-locale-1.4.0-locale-2008-10-04.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -39,6 +38,13 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* Sat Oct 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 1.4.0-20
+- Reverting all changes made Oct 4, as they should be made through Pootle
+- Applying Pootle patch, fixing [SME: 4618] and [SME: 4616]
+
+* Sat Oct 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 1.4.0-19
+- Apply 4 Oct locale patch
+
 * Sat Oct 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 1.4.0-18
 - Remove colored highlights from German locale [SME: 4618]
 - Fix changelog entry in previous entry for [SME: 4616]
@@ -386,7 +392,6 @@ SME Server localisation module
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)