--- rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/10/07 15:30:17	1.46
+++ rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/12/31 18:26:34	1.61
@@ -1,18 +1,31 @@
-# $Id: smeserver-locale.spec,v 1.45 2008/10/04 22:34:30 snetram Exp $
+# $Id: smeserver-locale.spec,v 1.60 2008/11/30 22:14:05 snetram Exp $
 
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
 %define version 2.0.0
-%define release 1
+%define release 14
 %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
+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
+Patch9: smeserver-locale-2.0.0-locale-2008-11-18.patch
+Patch10: smeserver-locale-2.0.0-locale-2008-11-19.patch
+Patch11: smeserver-locale-2.0.0-locale-2008-11-30.patch
+Patch12: smeserver-locale-2.0.0-locale-2008-12-31.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -24,6 +37,45 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* Wed Dec 31 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-14.sme
+- Apply 31 Dec 2008 locale patch [SME: 4899]
+
+* Sun Nov 30 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-13.sme
+- Apply 30 Nov 2008 locale patch [SME: 4813]
+
+* Tue Nov 19 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-12.sme
+- Apply 19 Nov 2008 locale patch [SME: 4748]
+
+* Tue Nov 18 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-11.sme
+- Apply 18 Nov 2008 locale patch [SME: 4748]
+
+* Fri 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]
 
@@ -367,6 +419,19 @@ 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
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)
@@ -482,6 +547,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}