--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/18 12:49:29	1.10
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/22 02:50:47	1.25
@@ -1,10 +1,10 @@
-# $Id: smeserver-zarafa.spec,v 1.9 2008/12/17 15:25:10 slords Exp $
+# $Id: smeserver-zarafa.spec,v 1.24 2008/12/22 02:29:40 dungog Exp $
 # Authority: dmay
 # Name: Darrell May
 
 %define name smeserver-zarafa
 %define version 0.9.0
-%define release 9
+%define release 21
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -14,10 +14,18 @@ URL: http://contribs.org
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-zarafa-0.9.0-removephp.patch
-Patch1: smeserver-zarafa-0.9.0-deluser.patch
-Patch2: smeserver-zarafa-0.9.0-deluserb.patch
 Patch3: smeserver-zarafa-0.9.0-props.patch
 Patch4: smeserver-zarafa-0.9.0-ports.patch
+Patch5: smeserver-zarafa-0.9.0-smessl.patch
+Patch6: smeserver-zarafa-0.9.0-smessl2.patch
+Patch7: smeserver-zarafa-0.9.0-smessl3.patch
+Patch8: smeserver-zarafa-0.9.0-ldap.patch
+Patch9: smeserver-zarafa-0.9.0-userprop1.patch
+Patch10: smeserver-zarafa-0.9.0-services2.patch
+Patch11: smeserver-zarafa-0.9.0-ports2.patch
+Patch12: smeserver-zarafa-0.9.0-http.patch
+Patch13: smeserver-zarafa-0.9.0-ldap2.patch
+Patch14: smeserver-zarafa-0.9.0-shutdown4.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools >= 1.13.1-03
@@ -29,6 +37,44 @@ AutoReqProv: no
 smserver rpm to setup zarafa
 
 %changelog
+* Mon Dec 21 2008 Stephen Noble <support@dungog.net> - 0.9-21
+- fix shutdown patch [SME 4883]
+
+* Mon Dec 21 2008 Stephen Noble <support@dungog.net> - 0.9-20
+- delete-user patches removed, not required for ldap/unix [SME 4881]
+- db needs create and delete, do them together, if required
+
+* Mon Dec 21 2008 Stephen Noble <support@dungog.net> - 0.9-19
+- service_link shutdown added [SME 4883]
+
+* Sun Dec 20 2008 Stephen Noble <support@dungog.net> - 0.9-18
+- ldap, bind password [SME 4869]
+
+* Sat Dec 19 2008 Stephen Noble <support@dungog.net> - 0.9-17
+- http alias changes [SME 4856]
+
+* Sat Dec 19 2008 Stephen Noble <support@dungog.net> - 0.9-16
+- minor change in ports and property names [SME 4846]
+
+* Sat Dec 19 2008 Stephen Noble <support@dungog.net> - 0.9-15
+- added action/zarafa-services-stop [SME 4870]
+- .qmail-junkmail fragment fixed and expanded [SME 4705]
+* Sat Dec 19 2008 Stephen Noble <support@dungog.net> - 0.9-14
+- default user zarafa property to enabled [SME 4870]
+- .qmail-junkmail fragment readded [SME 4705]
+
+* Fri Dec 18 2008 Stephen Noble <support@dungog.net> - 0.9-13
+- ldap plugin [SME 4869]
+
+* Fri Dec 18 2008 Stephen Noble <support@dungog.net> - 0.9-12
+- use sme ssl files fixes [SME 4846]
+* Fri Dec 18 2008 Stephen Noble <support@dungog.net> - 0.9-11
+- use sme ssl files fixes [SME 4836]
+* Fri Dec 18 2008 Stephen Noble <support@dungog.net> - 0.9-10
+- use sme ssl files [SME 4836]
+- change gateway ports to standard, requires changing sme ports manually
+- Requires: zarafa = 6.20, verify/update contrib before allowing updates
+
 * Thu Dec 18 2008 Stephen Noble <support@dungog.net> - 0.9-9
 - change default pop port to 8110, gateway.cfg [SME 4854]
 
@@ -59,10 +105,18 @@ smserver rpm to setup zarafa
 %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
+%patch13 -p1
+%patch14 -p1
 
 %build
 /usr/bin/perl createlinks