--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/17 08:30:24	1.4
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/20 08:42:14	1.16
@@ -1,6 +1,10 @@
+# $Id: smeserver-zarafa.spec,v 1.15 2008/12/20 07:07:11 dungog Exp $
+# Authority: dmay
+# Name: Darrell May
+
 %define name smeserver-zarafa
-%define version 0.9
-%define release 4a
+%define version 0.9.0
+%define release 15
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -9,19 +13,61 @@ License: GNU GPL version 2
 URL: http://contribs.org
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
-Patch0: %{name}-0.9-2a.patch
-Patch1: %{name}-0.9-4a.patch
+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
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Requires: e-smith-release >= 7.0
-Requires: zarafa
+Requires: zarafa = 6.20
 AutoReqProv: no
 
 %description
 smserver rpm to setup zarafa
 
 %changelog
+* 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]
+* 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]
+
+* Wed Dec 17 2008 Stephen Noble <support@dungog.net> - 0.9-8
+- add properties to cfg files. unix,server,ical,gateway [SME 4636]
+
+* Wed Dec 17 2008 Stephen Noble <support@dungog.net> - 0.9-7
+- add user-delete symlink [SME 4621]
+* Wed Dec 17 2008 Stephen Noble <support@dungog.net> - 0.9-6
+- add user-delete action [SME 4621]
+
+* Wed Dec 17 2008 Stephen Noble <support@dungog.net> - 0.9-5
+- remove php template: [SME 4620]
+
 * Mon Nov 03 2008 Darrell May <dmay@tallgrassranch.com>
 - added template to sort junk e-mail: Bug 4705
 - [0.9-4a]
@@ -39,6 +85,15 @@ smserver rpm to setup zarafa
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 /usr/bin/perl createlinks
@@ -58,8 +113,3 @@ rm -rf %{name}-%{version}
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
 
-%pre
-%preun
-%post
-%postun
-