--- rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/04 07:56:24	1.41
+++ rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/15 08:13:00	1.50
@@ -1,32 +1,21 @@
-# $Id: smeserver-locale.spec,v 1.40 2008/10/04 07:43:11 snetram Exp $
+# $Id: smeserver-locale.spec,v 1.49 2008/10/13 22:22:41 slords Exp $
 
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
-%define version 1.4.0
-%define release 17
+%define version 2.0.0
+%define release 4
 %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
-Patch14: smeserver-locale-1.4.0-removeReferrencesToWiki.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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -38,8 +27,31 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* 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
+
+* 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
-- Apply locale patch to fix many translation bugs [SME: 4616]
+- 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
@@ -367,20 +379,9 @@ SME Server localisation module
 
 %prep
 %setup
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%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)
@@ -496,6 +497,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}