--- rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/11/25 16:20:35	1.3
+++ rpms/smeserver-zarafa/contribs7/smeserver-zarafa.spec	2008/12/20 00:13:24	1.13
@@ -1,10 +1,10 @@
-# $Id: smeserver-zarafa.spec,v 1.1 2008/10/17 14:27:33 slords Exp $
+# $Id: smeserver-zarafa.spec,v 1.12 2008/12/19 16:19:25 dungog Exp $
 # Authority: dmay
 # Name: Darrell May
 
 %define name smeserver-zarafa
 %define version 0.9.0
-%define release 1%{?dist}
+%define release 12
 Summary: smserver rpm to setup zarafa
 Name: %{name}
 Version: %{version}
@@ -13,24 +13,74 @@ License: GNU GPL version 2
 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
 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
-* Wed Oct 08 2008 Darrell May <dmay@tallgrassranch.com> 0.9.0-1.sme
+* 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]
+* Mon Nov 03 2008 Darrell May <dmay@tallgrassranch.com>
+- added /usr/bin/perl createlinks to spec file: Bug 4725
+- [0.9-3a]
+* Wed Oct 08 2008 Darrell May <dmay@tallgrassranch.com>
+- smeserver-zarafa-0.9-2a.patch: Bug 4634
+- [0.9-2a]
+* Fri Oct 03 2008 Darrell May <dmay@tallgrassranch.com>
 - initial release
+- [0.9-1a]
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
+/usr/bin/perl createlinks
 
 %install
 rm -rf $RPM_BUILD_ROOT