--- rpms/smeserver-locale/sme7/smeserver-locale.spec	2008/12/31 18:26:34	1.61
+++ rpms/smeserver-locale/sme7/smeserver-locale.spec	2009/03/03 21:27:19	1.67
@@ -1,13 +1,13 @@
-# $Id: smeserver-locale.spec,v 1.60 2008/11/30 22:14:05 snetram Exp $
+# $Id: smeserver-locale.spec,v 1.66 2009/03/03 17:04:38 snetram Exp $
 
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
 %define version 2.0.0
-%define release 14
+%define release 19
 %define package_summary SME Server localisation module
 %define group Applications/System
-%define package_locales bg da de el es fr hu id it ja nl pt pt_BR sl sv tr
+%define package_locales bg da de el es fr hu id it ja nb nl pt pt_BR ru sl sv tr zh_CN
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -26,6 +26,10 @@ Patch9: smeserver-locale-2.0.0-locale-20
 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
+Patch13: smeserver-locale-2.0.0-locale-2009-01-31.patch
+Patch14: smeserver-locale-2.0.0-locale-2009-02-09.patch
+Patch15: smeserver-locale-2.0.0-locale-2009-03-01.patch
+Patch16: smeserver-locale-2.0.0-locale-2009-03-03.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -37,6 +41,24 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
+* Tue Mar 03 2009 SME Translation Server
+- re-apply locale 2009-03-03 patch
+
+* Tue Mar  3 2009 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-18.sme
+- Apply  3 Mar 2009 locale patch [SME: 5051]
+
+* Sun Mar  1 2009 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-17.sme
+- Apply  1 Mar 2009 locale patch [SME: 5017]
+- Added missing bug references to changelog entry [SME: 5002]
+
+* Mon Feb 09 2009 Shad L. Lords <slords@mail.com> - 2.0.0-16.sme
+- Add Chineese (China) language [SME: 5002]
+- Add Norwegian (Bokmal) language [SME: 5002]
+- Add Russian language [SME: 5002]
+
+* Sat Jan 31 2009 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-15.sme
+- Apply 31 Jan 2009 locale patch [SME: 4950]
+
 * Wed Dec 31 2008 Jonathan Martens <smeserver-contribs@snetram.nl> - 2.0.0-14.sme
 - Apply 31 Dec 2008 locale patch [SME: 4899]
 
@@ -432,6 +454,10 @@ SME Server localisation module
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)
@@ -459,8 +485,8 @@ do
     echo "%defattr(-,root,root)" > \
 	%{name}-%{version}-%{release}-filelist-$locale
 
-    grep locale/$locale %{name}-%{version}-%{release}-filelist >> \
-	%{name}-%{version}-%{release}-filelist-$locale
+    grep -e locale/$locale/ -e locale/$(echo $locale | tr '[:upper:]_' '[:lower:]-')/ \
+         %{name}-%{version}-%{release}-filelist >> %{name}-%{version}-%{release}-filelist-$locale
 done
 
 %clean 
@@ -523,7 +549,6 @@ 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}
@@ -555,6 +580,14 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %{summary}
 %files ja -f %{name}-%{version}-%{release}-filelist-ja
 
+%package nb
+Summary: %{package_summary} - Norwegian (Bokmal)
+Group: %{group}
+Requires: e-smith-formmagick >= 1.4.0-10
+%description nb
+%{summary}
+%files nb -f %{name}-%{version}-%{release}-filelist-nb
+
 %package nl
 Summary: %{package_summary} - Dutch
 Group: %{group}
@@ -582,6 +615,15 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %{summary}
 %files pt_BR -f %{name}-%{version}-%{release}-filelist-pt_BR
 
+%package ru
+Summary: %{package_summary} - Russian
+Group: %{group}
+Requires: aspell-ru
+Requires: e-smith-formmagick >= 1.4.0-10
+%description ru
+%{summary}
+%files ru -f %{name}-%{version}-%{release}-filelist-ru
+
 %package sl
 Summary: %{package_summary} - Slovinian
 Group: %{group}
@@ -603,8 +645,15 @@ Requires: e-smith-formmagick >= 1.4.0-10
 %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
+
+%package zh_CN
+Summary: %{package_summary} - Chinese (China)
+Group: %{group}
+Requires: e-smith-formmagick >= 1.4.0-10
+%description zh_CN
+%{summary}
+%files zh_CN -f %{name}-%{version}-%{release}-filelist-zh_CN