--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/20 00:13:24	1.13
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2009/01/17 08:22:08	1.30
@@ -1,10 +1,10 @@
-# $Id: smeserver-zarafa.spec,v 1.12 2008/12/19 16:19:25 dungog Exp $
+# $Id: smeserver-zarafa.spec,v 1.29 2009/01/17 07:54:57 dungog Exp $
 # Authority: dmay
 # Name: Darrell May
 
 %define name smeserver-zarafa
 %define version 0.9.0
-%define release 12
+%define release 26
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -14,13 +14,24 @@ 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
+Patch15: smeserver-zarafa-0.9.0-shutdown5.patch
+Patch16: smeserver-zarafa-0.9.0-update2.patch
+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
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools >= 1.13.1-03
@@ -32,6 +43,52 @@ AutoReqProv: no
 smserver rpm to setup zarafa
 
 %changelog
+* 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]
+- reset dagent.cfg template to default
+
+* Mon Dec 21 2008 Stephen Noble <support@dungog.net> - 0.9-24
+- add post-update links [SME 4871]
+- shutdown6 uses S99 [SME 4883]
+
+* Mon Dec 21 2008 Stephen Noble <support@dungog.net> - 0.9-23
+- trigger zarafa-update on updates of zarafa* rpms [SME 4886]
+
+* 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]
+
+* 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
@@ -71,13 +128,24 @@ 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
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %build
 /usr/bin/perl createlinks
@@ -97,3 +165,7 @@ rm -rf %{name}-%{version}
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
 
+%triggerin -- zarafa
+/etc/e-smith/events/actions/zarafa-update
+
+