--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/20 08:42:14	1.16
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/22 02:29:40	1.24
@@ -1,10 +1,10 @@
-# $Id: smeserver-zarafa.spec,v 1.15 2008/12/20 07:07:11 dungog Exp $
+# $Id: smeserver-zarafa.spec,v 1.23 2008/12/22 02:20:37 dungog Exp $
 # Authority: dmay
 # Name: Darrell May
 
 %define name smeserver-zarafa
 %define version 0.9.0
-%define release 15
+%define release 20
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -14,16 +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-userprop.patch
-Patch10: smeserver-zarafa-0.9.0-services.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-shutdown3.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools >= 1.13.1-03
@@ -35,9 +37,25 @@ AutoReqProv: no
 smserver rpm to setup zarafa
 
 %changelog
+* 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 [SME 4705]
+- .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]
@@ -84,8 +102,6 @@ smserver rpm to setup zarafa
 %prep
 %setup
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -94,6 +110,10 @@ smserver rpm to setup zarafa
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 /usr/bin/perl createlinks