--- rpms/smeserver-locale/sme8/smeserver-locale.spec	2008/03/26 00:03:22	1.26
+++ rpms/smeserver-locale/sme8/smeserver-locale.spec	2008/10/07 15:30:18	1.46
@@ -1,20 +1,18 @@
+# $Id: smeserver-locale.spec,v 1.45 2008/10/04 22:34:40 snetram Exp $
+
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
-%define version 1.4.0
-%define release 6
+%define version 2.2.0
+%define release 1
 %define package_summary SME Server localisation module
 %define group Applications/System
-%define package_locales 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
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: smeserver-locale-UTF8.patch
-Patch2: smeserver-locale-remove_pt.patch
-Patch3: smeserver-locale-2008-03-18.patch
-Patch4: smeserver-locale-2008-03-25.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -26,6 +24,57 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* 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
+
+* Fri Jun 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-11
+- Apply 27 Jun 2008 locale patch
+
+* Tue May 5 2008 Shad L. Lords <slords@mail.com> 1.4.0-10
+- Update to May 5 2008 translations
+- Revert Apr 23 2008 translations (bad patch)
+
+* Wed Apr 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-9
+- Update to Apr 23 2008 translations
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 1.4.0-8
+- Update to Apr 1 2008 translations
+
+* Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 1.4.0-7
+- Update to Mar 26 2008 translations
+
 * Tue Mar 25 2008 Shad L. Lords <slords@mail.com> 1.4.0-6
 - Update to Mar 25 2008 translations
 
@@ -318,10 +367,6 @@ SME Server localisation module
 
 %prep
 %setup
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)
@@ -356,6 +401,15 @@ done
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
+%package bg
+Summary: %{package_summary} - Bulgarian
+Group: %{group}
+Requires: aspell-bg
+Requires: e-smith-formmagick >= 1.4.0-10
+%description bg
+%{summary}
+%files bg -f %{name}-%{version}-%{release}-filelist-bg
+
 %package da
 Summary: %{package_summary} - Danish
 Group: %{group}
@@ -404,6 +458,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}
@@ -436,11 +491,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
@@ -462,3 +526,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