--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/22 01:45:19	1.22
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/22 05:32:01	1.26
@@ -1,10 +1,10 @@
-# $Id: smeserver-zarafa.spec,v 1.21 2008/12/22 01:39:03 dungog Exp $
+# $Id: smeserver-zarafa.spec,v 1.25 2008/12/22 02:50:47 dungog Exp $
 # Authority: dmay
 # Name: Darrell May
 
 %define name smeserver-zarafa
 %define version 0.9.0
-%define release 19
+%define release 22
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -20,11 +20,13 @@ Patch5: smeserver-zarafa-0.9.0-smessl.pa
 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
+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
+Patch15: smeserver-zarafa-0.9.0-shutdown5.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools >= 1.13.1-03
@@ -36,6 +38,15 @@ AutoReqProv: no
 smserver rpm to setup zarafa
 
 %changelog
+* Mon Dec 21 2008 Stephen Noble <support@dungog.net> - 0.9-22
+- fix shutdown patch again [SME 4883]
+* 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]
 
@@ -108,6 +119,8 @@ smserver rpm to setup zarafa
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 /usr/bin/perl createlinks