--- rpms/smeserver-locale/sme8/smeserver-locale.spec	2010/02/25 10:49:02	1.75
+++ rpms/smeserver-locale/sme8/smeserver-locale.spec	2010/04/29 14:39:03	1.80
@@ -1,10 +1,10 @@
-# $Id: smeserver-locale.spec,v 1.74 2009/10/27 17:49:21 slords Exp $
+# $Id: smeserver-locale.spec,v 1.79 2010/04/29 14:36:53 slords Exp $
 
 Summary: SME Server localisation module
 %define name smeserver-locale
 Name: %{name}
 %define version 2.2.0
-%define release 25
+%define release 28
 %define package_summary SME Server localisation module
 %define group Applications/System
 %define package_locales bg da de el es et fr hu id it ja nb nl pl pt pt_BR ro ru sl sv th tr zh_CN
@@ -35,7 +35,9 @@ Patch18: smeserver-locale-2.2.0-locale-2
 Patch19: smeserver-locale-2.2.0-locale-2009-05-27.patch
 Patch20: smeserver-locale-2.2.0-locale-2009-08-24.patch
 Patch21: smeserver-locale-2.2.0-locale-2009-10-27.patch
-Patch22: smeserver-locale-2.0.0-locale-2010-02-25.patch
+Patch22: smeserver-locale-2.0.0-locale-2010-02-27.patch
+Patch23: smeserver-locale-2.2.0-locale-2010-03-02.patch
+Patch24: smeserver-locale-2.2.0-locale-2010-04-29.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: perl
@@ -47,7 +49,18 @@ AutoReqProv: no
 SME Server localisation module
 
 %changelog
-* Thu Feb 25 2010 SME Translation Server <translations@contribs.org> 2.2.0-25.sme
+* Thu Apr 29 2010 SME Translation Server <translations@contribs.org> 2.2.0-28.sme
+- apply locale 2010-04-29 patch
+
+* Tue Mar 02 2010 SME Translation Server <translations@contribs.org> 2.2.0-27.sme
+- apply locale 2010-03-02 patch
+
+* Sat Feb 27 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-26.sme
+- Revert previous patch to resync with generated patches based on SME Server 7 [SME: 5803]
+- Correct previous changelog entry
+- Apply locale 2010-02-27 patch
+
+* Thu Feb 25 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-25.sme
 - apply locale 2010-02-25 patch
 
 * Tue Oct 27 2009 SME Translation Server <translations@contribs.org> 2.2.0-24.sme
@@ -492,6 +505,8 @@ SME Server localisation module
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %build
 LEXICONS=$(find root/etc/e-smith/locale -type f)