diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-ical/TCPPort smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ical/TCPPort
--- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-ical/TCPPort	2009-03-06 21:23:22.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-ical/TCPPort	2009-03-06 21:24:58.000000000 +1100
@@ -1 +1 @@
-8089
+8088
diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-icals/access smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-icals/access
--- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-icals/access	1970-01-01 10:00:00.000000000 +1000
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-icals/access	2009-03-06 21:24:29.000000000 +1100
@@ -0,0 +1 @@
+public
diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-icals/status smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-icals/status
--- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-icals/status	1970-01-01 10:00:00.000000000 +1000
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-icals/status	2009-03-06 21:24:29.000000000 +1100
@@ -0,0 +1 @@
+enabled
diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-icals/TCPPort smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-icals/TCPPort
--- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-icals/TCPPort	1970-01-01 10:00:00.000000000 +1000
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-icals/TCPPort	2009-03-06 21:24:29.000000000 +1100
@@ -0,0 +1 @@
+8089
diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-icals/type smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-icals/type
--- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/db/configuration/defaults/zarafa-icals/type	1970-01-01 10:00:00.000000000 +1000
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/db/configuration/defaults/zarafa-icals/type	2009-03-06 21:24:29.000000000 +1100
@@ -0,0 +1 @@
+service
diff -urN smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/ical.cfg/ical.cfg smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ical.cfg/ical.cfg
--- smeserver-zarafa-0.9.0.orig/root/etc/e-smith/templates/etc/zarafa/ical.cfg/ical.cfg	2009-03-06 21:23:22.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ical.cfg/ical.cfg	2009-03-06 21:26:42.000000000 +1100
@@ -20,13 +20,13 @@
 ical_enable	=  { if (${'zarafa-ical'}{status} eq 'enabled') {'yes'} else {'no'}; }
 
 # port which the ical server listens on for normal connections
-ical_port	 =	 { ${'zarafa-ical'}{icalport} || '8088'; }
+ical_port	 =	 { ${'zarafa-ical'}{TCPPort} || '8088'; }
 
 # wether ssl connections can be made to the ical server
-icals_enable =  { if (${'zarafa-ical'}{status} eq 'enabled') {'yes'} else {'no'}; }
+icals_enable =  { if (${'zarafa-icals'}{status} eq 'enabled') {'yes'} else {'no'}; }
 
 # port which the ical server listens on for ssl connections
-icals_port	 =	 { ${'zarafa-ical'}{TCPPort} || '8089'; }
+icals_port	 =	 { ${'zarafa-icals'}{TCPPort} || '8089'; }
 
 # default connection to the Zarafa server
 server_socket	=	http://localhost:{${'zarafa-server'}{tcpport}||'236';}/zarafa
diff -urN smeserver-zarafa-0.9.0.orig/smeserver-zarafa.spec smeserver-zarafa-0.9.0/smeserver-zarafa.spec
--- smeserver-zarafa-0.9.0.orig/smeserver-zarafa.spec	2009-03-06 21:23:22.000000000 +1100
+++ smeserver-zarafa-0.9.0/smeserver-zarafa.spec	1970-01-01 10:00:00.000000000 +1000
@@ -1,51 +0,0 @@
-%define name smeserver-zarafa
-%define version 0.9
-%define release 1a
-Summary: smserver rpm to setup zarafa
-Name: %{name}
-Version: %{version}
-Release: %{release}%{?dist}
-License: GNU GPL version 2
-URL: http://contribs.org
-Group: SMEserver/addon
-Source: %{name}-%{version}.tar.gz
-BuildArchitectures: noarch
-BuildRoot: /var/tmp/%{name}-%{version}
-BuildRequires: e-smith-devtools >= 1.13.1-03
-Requires: e-smith-release >= 7.0
-Requires: zarafa
-AutoReqProv: no
-
-%description
-smserver rpm to setup zarafa
-
-%changelog
-* Thu Oct 02 2008 Darrell May <dmay@tallgrassranch.com>
-- initial release
-- [0.9-1]
-
-%prep
-%setup
-
-%build
-
-%install
-rm -rf $RPM_BUILD_ROOT
-(cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
-rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-    > %{name}-%{version}-filelist
-echo "%doc COPYING"  >> %{name}-%{version}-filelist
-
-%clean
-cd ..
-rm -rf %{name}-%{version}
-
-%files -f %{name}-%{version}-filelist
-%defattr(-,root,root)
-
-%pre
-%preun
-%post
-%postun
-