--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2009/09/07 12:50:40	1.46
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2010/05/23 19:15:14	1.58
@@ -1,10 +1,10 @@
-# $Id: smeserver-zarafa.spec,v 1.45 2009/08/24 17:58:14 slords Exp $
+# $Id: smeserver-zarafa.spec,v 1.57 2010/05/22 18:13:21 bytegw Exp $
 # Authority: dmay
 # Name: Darrell May
 
 %define name smeserver-zarafa
 %define version 0.9.0
-%define release 42
+%define release 54
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -48,16 +48,70 @@ Patch33: smeserver-zarafa-0.9.0-panels2.
 Patch34: smeserver-zarafa-0.9.0-panels3.patch
 Patch35: smeserver-zarafa-0.9.0-locale-2009-08-24.patch
 Patch36: smeserver-zarafa-0.9.0-Clic.patch
+Patch37: smeserver-zarafa-0.9.0-locale-2009-10-21.patch
+Patch38: smeserver-zarafa-0.9.0-locale-2009-10-27.patch
+Patch39: smeserver-zarafa-0.9.0-move-webaccess.patch2
+Patch40: smeserver-zarafa-0.9.0-services3.patch
+Patch41: smeserver-zarafa-0.9.0-ldap3.patch
+Patch42: smeserver-zarafa-0.9.0-ldap4.patch
+Patch43: smeserver-zarafa-0.9.0-hidesystem.patch
+Patch44: smeserver-zarafa-0.9.0-locale-2010-03-02.patch
+Patch45: smeserver-zarafa-0.9.0-unix_plugin_fix.patch
+Patch46: smeserver-zarafa-0.9.0-events_update_unix_plugin.patch
+Patch47: smeserver-zarafa-0.9.0-restore_missing_settings.patch
+Patch48: smeserver-zarafa-0.9.0-locale-2010-05-23.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Requires: e-smith-release >= 7.0
+Requires: zarafa >= 6.30.6
 AutoReqProv: no
 
 %description
 smserver rpm to setup zarafa
 
 %changelog
+* Sun May 23 2010 SME Translation Server <translations@contribs.org> 0.9.0-54.sme
+- apply locale 2010-05-23 patch
+
+* Sat May 22 2010 Gavin Weight <gweight@gweight.com> - 0.9-53
+- Restore missing lines from unix.cfg.
+
+* Sat May 22 2010 Gavin Weight <gweight@gweight.com> - 0.9-52
+- Update unix plugin to exclude non-valid users/groups [SME: 5828]
+- Add actions for templates to expand unix.cfg
+- Add actions for services2adjust to unix.cfg
+
+* Tue Mar 02 2010 SME Translation Server <translations@contribs.org> 0.9.0-51.sme
+- apply locale 2010-03-02 patch
+
+* Sat Feb 20 2010 Stephen Noble <support@dungog.net> - 0.9-50
+- hide system and everyone in addressbook [SME 5790]
+
+* Tue Feb 16 2010 Stephen Noble <support@dungog.net> - 0.9-49
+- use anon bind to login [SME 5779]
+
+* Sat Feb 13 2010 Stephen Noble <support@dungog.net> - 0.9-48
+- update ldap.cfg for 6.40 [SME 5779]
+- default mysql InnoDB enabled
+
+* Sat Feb 13 2010 Stephen Noble <support@dungog.net> - 0.9-47
+- fix service scripts [SME 5672]
+
+* Thu Feb 11 2010 Stephen Noble <support@dungog.net> - 0.9-46
+- fix install and update scripts [SME 5672]
+- tested OK on 6.40
+
+* Thu Feb 11 2010 Stephen Noble <support@dungog.net> - 0.9-45
+- webaccess location changed upstream [SME 5672]
+- requires zarafa >= 6.30.6
+
+* Tue Oct 27 2009 SME Translation Server <translations@contribs.org> 0.9.0-44.sme
+- apply locale 2009-10-27 patch
+
+* Wed Oct 21 2009 SME Translation Server <translations@contribs.org> 0.9.0-43.sme
+- apply locale 2009-10-21 patch
+
 * Mon Sep 7 2009 Stephen Noble <support@dungog.net> - 0.9-42
 - typo in language string [SME 5420]
 
@@ -220,6 +274,18 @@ smserver rpm to setup zarafa
 %patch34 -p1
 %patch35 -p1
 %patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%patch47 -p1
+%patch48 -p1
 
 %build
 /usr/bin/perl createlinks