--- rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/07/01 20:44:54	1.35
+++ rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/04 22:34:30	1.45
@@ -1,13 +1,13 @@
-# $Id: smeserver-locale.spec,v 1.34 2008/07/01 20:38:08 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 12
+%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_BR sl sv
+%define package_locales bg da de el es fr hu id it nl pt pt_BR sl sv tr
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,6 +22,11 @@ Patch6: smeserver-locale-2008-04-01.patc
 Patch7: smeserver-locale-2008-05-05.patch
 Patch8: smeserver-locale-2008-06-27.patch
 Patch9: smeserver-locale-2008-07-01.patch
+Patch10: smeserver-locale-1.4.0-locale-2008-07-26.patch
+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-locale-2008-10-04.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -33,6 +38,35 @@ 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]
+
+* Sat Oct 4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 1.4.0-17
+- Remove references to the wiki from the German locale [SME: 4616]
+- Fix bug referrence in previous changelog entry [SME: 4617]
+
+* Fri Oct 3 2008 Shad L. Lords <slords@mail.com> - 1.4.0-16
+- Apply locale patch to fix many translation bugs [SME: 4615]
+
+* Tue Sep 30 2008 Stephen Noble <support@dungog.net> - 1.4.0-15
+- Apply locale patch
+
+* Sat Sep 27 2008 Stephen Noble <support@dungog.net> - 1.4.0-14
+- Apply locale patch
+
+* Sat Jul 26 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-13
+- Apply Jul 26 2008 locale patch
+- Add Portuguese language
+- Add Turkish language
+
 * Tue Jul 1 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-12
 - Apply 1 July 2008 locale patch
 
@@ -353,6 +387,11 @@ SME Server localisation module
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)
@@ -444,6 +483,7 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %package hu
 Summary: %{package_summary} - Hungarian
 Group: %{group}
+#Requires: aspell-hu
 Requires: e-smith-formmagick >= 1.4.0-10
 %description hu
 %{summary}
@@ -476,11 +516,20 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %{summary}
 %files nl -f %{name}-%{version}-%{release}-filelist-nl
 
-%package pt_BR
+%package pt
 Summary: %{package_summary} - Portugese
 Group: %{group}
 Requires: aspell-pt
 Requires: e-smith-formmagick >= 1.4.0-10
+%description pt
+%{summary}
+%files pt -f %{name}-%{version}-%{release}-filelist-pt
+
+%package pt_BR
+Summary: %{package_summary} - Portugese (Brazilian)
+Group: %{group}
+Requires: aspell-pt
+Requires: e-smith-formmagick >= 1.4.0-10
 %description pt_BR
 %{summary}
 %files pt_BR -f %{name}-%{version}-%{release}-filelist-pt_BR
@@ -502,3 +551,12 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %description sv
 %{summary}
 %files sv -f %{name}-%{version}-%{release}-filelist-sv
+
+%package tr
+Summary: %{package_summary} - Turkish
+Group: %{group}
+#Requires: aspell-tr
+Requires: e-smith-formmagick >= 1.4.0-10
+%description tr
+%{summary}
+%files tr -f %{name}-%{version}-%{release}-filelist-tr