--- rpms/smeserver-mod_dav/contribs7/smeserver-mod_dav.spec	2008/02/22 11:25:10	1.3
+++ rpms/smeserver-mod_dav/contribs7/smeserver-mod_dav.spec	2008/04/02 15:03:58	1.7
@@ -1,6 +1,10 @@
+# $Id$
+# Authority: snetram
+# Name: Jonathan Martens
+
 %define name smeserver-mod_dav
 %define version 0.1
-%define release 5
+%define release 8
 
 Summary: SME Server mod_dav implementation
 Name: %{name}
@@ -9,6 +13,8 @@ Release: %{release}%{?dist}
 License: GPL
 Group: Applications/Internet
 Source: %{name}-%{version}-2.tgz
+Patch1: smeserver-mod_dav-0.1-initdb.patch
+Patch2: smeserver-mod_dav-0.1-ImplementDAVForIbays.patch
 BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: smeserver-release >= 7 httpd >= 2
@@ -18,6 +24,17 @@ BuildRequires: e-smith-devtools >= 1.13.
 Implementation of mod_dav for SME Server 7.
 
 %changelog
+* Sun Mar 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
+- 0.1-8
+- Fixed template issue created in 0.1-7 by [SME: 3470]
+
+* Sun Mar 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
+- 0.1-7
+- Added WebDAV access to ibays [SME: 3470]
+
+* Mon Feb 25 2008 Shad L. Lords <slords@mail.com> 0.1-6
+- Remove scripts and move db initialition to package
+
 * Fri Feb 22 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
 - 0.1-5
 - Removed initialize-default-database from %post macro
@@ -41,15 +58,11 @@ Implementation of mod_dav for SME Server
 %prep
 
 %setup
+%patch1 -p1
+%patch2 -p1
 
 %build
 
-DEFAULTS=root/etc/e-smith/db/configuration/defaults/modDAV
-mkdir -p $DEFAULTS
-
-echo "service"  > $DEFAULTS/type
-echo "enabled"  > $DEFAULTS/status
-
 %install
 rm -rf %buildroot
 (cd root ; find . -depth -print | cpio -dump %buildroot)
@@ -59,16 +72,5 @@ rm -f %{name}-%{version}-filelist
 %clean
 rm -rf %buildroot
 
-%post
-/etc/e-smith/events/actions/navigation-conf
-/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-/usr/bin/sv t httpd-e-smith
-
-%postun
-/sbin/e-smith/db configuration delete modDAV
-/etc/e-smith/events/actions/navigation-conf
-/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-/usr/bin/sv t httpd-e-smith
-
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)