--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2009/01/17 07:54:57	1.29
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2010/02/11 13:09:45	1.49
@@ -1,10 +1,10 @@
-# $Id: smeserver-zarafa.spec,v 1.28 2008/12/22 13:11:01 dungog Exp $
+# $Id: smeserver-zarafa.spec,v 1.48 2009/10/27 17:43:52 slords Exp $
 # Authority: dmay
 # Name: Darrell May
 
 %define name smeserver-zarafa
 %define version 0.9.0
-%define release 25
+%define release 45
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -31,17 +31,94 @@ Patch16: smeserver-zarafa-0.9.0-update2.
 Patch17: smeserver-zarafa-0.9.0-install.patch
 Patch18: smeserver-zarafa-0.9.0-shutdown6.patch
 Patch19: smeserver-zarafa-0.9.0-playnice.patch
+Patch20: smeserver-zarafa-0.9.0-globalforward.patch
+Patch21: smeserver-zarafa-0.9.0-impdisabled.patch
+Patch22: smeserver-zarafa-0.9.0-icals.patch
+Patch23: smeserver-zarafa-0.9.0-panels.patch
+Patch24: smeserver-zarafa-0.9.0-smessl4.patch
+Patch25: smeserver-zarafa-0.9.0-http2.patch
+Patch26: smeserver-zarafa-0.9.0-templates.patch
+Patch27: smeserver-zarafa-0.9.0-ports3.patch
+Patch28: smeserver-zarafa-0.9.0-smessl5.patch
+Patch29: smeserver-zarafa-0.9.0-smessl6.patch
+Patch30: smeserver-zarafa-0.9.0-zarafaPublic.patch
+Patch31: smeserver-zarafa-0.9.0-zarafaPublic2.patch
+Patch32: smeserver-zarafa-0.9.0-locale-2009-07-27.patch
+Patch33: smeserver-zarafa-0.9.0-panels2.patch
+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.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.20
+Requires: zarafa >= 6.30.6
 AutoReqProv: no
 
 %description
 smserver rpm to setup zarafa
 
 %changelog
+* Thu Feb 11 2010 Stephen Noble <support@dungog.net> - 0.9-45
+- webaccess location changed upstream [SME 5420]
+- 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]
+
+* Mon Aug 24 2009 SME Translation Server <translations@contribs.org> 0.9.0-41.sme
+- apply locale 2009-08-24 patch
+
+* Mon Jul 27 2009 Stephen Noble <support@dungog.net> - 0.9-40
+- update zarafa config panels [SME 5310]
+
+* Mon Jul 27 2009 Stephen Noble <support@dungog.net> - 0.9-38
+- add translations for panels
+
+* Mon Jul 27 2009 Stephen Noble <support@dungog.net> - 0.9-36/37
+- db setting to deliver mail to Public folders [SME 5412]
+
+* Mon Jul 27 2009 Stephen Noble <support@dungog.net> - 0.9-35
+- fix defaults/zarafa-server/access private [SME 5368]
+
+* Mon Jul 27 2009 Stephen Noble <support@dungog.net> - 0.9-34
+- fix defaults/zarafa/access SSL [SME 5367]
+
+* Mon Jul 27 2009 Stephen Noble <support@dungog.net> - 0.9-33
+- fix ical.cfg TCPPort error in templates [SME 5410]
+
+* Thu Jun 11 2009 Stephen Noble <support@dungog.net> - 0.9-32
+- remove unused templates in /etc/zarafa/ [SME 5357]
+
+* Sat Jun 06 2009 Stephen Noble <support@dungog.net> - 0.9-31
+- fix httpd.conf syntax error [SME 5162]
+
+* Sat Jun 06 2009 Stephen Noble <support@dungog.net> - 0.9-30
+- server.cfg server_ssl_enabled = yes [SME 5213]
+
+* Mon Jun 01 2009 Stephen Noble <support@dungog.net> - 0.9-29
+- add zarafa config panels [SME 5310]
+- Thanks Marc Kelkermans at ati-informatique.net
+
+* Fri Mar 06 2009 Stephen Noble <support@dungog.net> - 0.9-28
+- add zarafa-icals service [SME 4874]
+
+* Sat Feb 21 2009 Stephen Noble <support@dungog.net> - 0.9-27
+- allow /webmail if $imp{status} disabled [SME 4957]
+- remove requires 6.20
+
+* Sat Jan 17 2009 Stephen Noble <support@dungog.net> - 0.9-26
+- add globalForward to .qmail [SME 4891]
+
 * Wed Dec 31 2008 Darrell May <dmay@tallgrassranhc.com> - 0.9-25
 - add playnice patch [SME 4891]
 - add separate db entries for zarafa pop/pop3/imap/imaps ports [SME 4912]
@@ -141,6 +218,25 @@ smserver rpm to setup zarafa
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
 
 %build
 /usr/bin/perl createlinks