--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/20 13:30:26	1.18
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/22 01:45:19	1.22
@@ -1,10 +1,10 @@
-# $Id: smeserver-zarafa.spec,v 1.17 2008/12/20 09:11:11 dungog Exp $
+# $Id: smeserver-zarafa.spec,v 1.21 2008/12/22 01:39:03 dungog Exp $
 # Authority: dmay
 # Name: Darrell May
 
 %define name smeserver-zarafa
 %define version 0.9.0
-%define release 16
+%define release 19
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -14,8 +14,6 @@ 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
@@ -25,6 +23,8 @@ Patch8: smeserver-zarafa-0.9.0-ldap.patc
 Patch9: smeserver-zarafa-0.9.0-userprop.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
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools >= 1.13.1-03
@@ -36,6 +36,15 @@ AutoReqProv: no
 smserver rpm to setup zarafa
 
 %changelog
+* 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]
 
@@ -88,8 +97,6 @@ smserver rpm to setup zarafa
 %prep
 %setup
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -99,6 +106,8 @@ smserver rpm to setup zarafa
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 /usr/bin/perl createlinks