--- rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/04 15:38:05	1.44
+++ rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/11/07 07:52:24	1.56
@@ -1,31 +1,27 @@
-# $Id: smeserver-locale.spec,v 1.43 2008/10/04 10:00:49 snetram Exp $
+# $Id: smeserver-locale.spec,v 1.55 2008/11/06 08:32:24 snetram Exp $
 
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
-%define version 1.4.0
-%define release 20
+%define version 2.0.0
+%define release 10
 %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
+%define package_locales bg da de el es fr hu id it ja 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
-Patch5: smeserver-locale-2008-03-26.patch
-Patch6: smeserver-locale-2008-04-01.patch
-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
+Patch0: smeserver-locale-2.0.0-locale-2008-10-08.patch
+Patch1: smeserver-locale-2.0.0-locale-2008-10-13.patch
+Patch2: smeserver-locale-2.0.0-locale-2008-10-15.patch
+Patch3: smeserver-locale-2.0.0-locale-2008-10-16.patch
+Patch4: smeserver-locale-2.0.0-locale-2008-10-17.patch
+Patch5: smeserver-locale-2.0.0-locale-2008-10-19.patch
+Patch6: smeserver-locale-2.0.0-locale-2008-11-02.patch
+Patch7: smeserver-locale-2.0.0-locale-2008-11-06.patch
+Patch8: smeserver-locale-2.0.0-locale-2008-11-07.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -37,8 +33,39 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* Thu Nov  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-10.sme
+- Apply  7 Nov 2008 locale patch [SME: 4748]
+
+* Thu Nov  6 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-9.sme
+- Apply  6 Nov 2008 locale patch [SME: 4746]
+
+* Sun Nov 2 2008 Shad L. Lords <slords@mail.com> - 2.0.0-8.sme
+- Apply 2 Nov 2008 locale patch
+
+* Mon Oct 20 2008 Stephen Noble <support@dungog.net> - 2.0.0-7.sme
+- Apply 19 Oct 2008 locale patch [SME: 4692]
+
+* Thu Oct 17 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-6.sme
+- Apply 17 Oct 2008 locale patch
+
+* Thu Oct 16 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-5.sme
+- Apply 16 Oct 2008 locale patch
+
+* Wed Oct 15 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-4.sme
+- Apply 15 Oct 2008 locale patch
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> - 2.0.0-3.sme
+- Add Japanese language [SME: 4637]
+
+* Wed Oct 8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-2.sme
+- Apply Oct 8 locale patch, fixing last colored highlight from German locale [SME 4618]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.0.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
@@ -376,6 +403,7 @@ SME Server localisation module
 
 %prep
 %setup
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -384,11 +412,6 @@ SME Server localisation module
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)
@@ -504,6 +527,14 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %{summary}
 %files it -f %{name}-%{version}-%{release}-filelist-it
 
+%package ja
+Summary: %{package_summary} - Japanese
+Group: %{group}
+Requires: e-smith-formmagick >= 1.4.0-10
+%description ja
+%{summary}
+%files ja -f %{name}-%{version}-%{release}-filelist-ja
+
 %package nl
 Summary: %{package_summary} - Dutch
 Group: %{group}