--- rpms/smeserver-mod_dav/contribs7/smeserver-mod_dav.spec	2008/02/06 21:11:46	1.2
+++ rpms/smeserver-mod_dav/contribs7/smeserver-mod_dav.spec	2008/11/25 16:20:26	1.20
@@ -1,6 +1,10 @@
+# $Id: smeserver-mod_dav.spec,v 1.18 2008/09/17 17:37:41 snetram Exp $
+# Authority: snetram
+# Name: Jonathan Martens
+
 %define name smeserver-mod_dav
 %define version 0.1
-%define release 4
+%define release 16
 
 Summary: SME Server mod_dav implementation
 Name: %{name}
@@ -9,6 +13,12 @@ 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
+Patch3: smeserver-mod_dav-0.1-FileETagDirective.patch
+Patch4: smeserver-mod_dav-0.1-fixTypo.patch
+Patch5: smeserver-mod_dav-0.1-fixAuthName.patch
+
 BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: smeserver-release >= 7 httpd >= 2
@@ -18,8 +28,51 @@ BuildRequires: e-smith-devtools >= 1.13.
 Implementation of mod_dav for SME Server 7.
 
 %changelog
+* Wed Sep 17 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-16
+- Fix AuthName error in httpd error log when not specified [SME: 4563]
+
+* Sun Aug 24 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-15
+- Create DAVLocks DB directory, remove lock file creating routine as this 
+  is done by the mod_dav module [SME: 4517]
+
+* Sun Aug 24 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-14
+- Create DAVLocks DB directory, fixing privileges [SME: 4517]
+
+* Sat Aug 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-13
+- Create DAVLocks DB directory, fixing case [SME: 4517]
+
+* Sat Aug 23 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-12
+- Create DAVLocks DB directory [SME: 4517]
+
+* Thu Aug 14 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-11
+- Fix typo in 95Addmod_dav2ibays [SME: 4502]
+
+* Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-10
+- Make FileETag key line out in configuration file properly [SME: 4482]
+- Fixing changelog date in previous changelog entry
+
+* Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-9
+- Add database key for implementating FileETag directive, for more information on 
+  this key see http://httpd.apache.org/docs/2.0/mod/core.html#fileetag [SME: 4482]
+
+* 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
+- Fixed previous changelog entry to have correct version number
+
 * Wed Feb 06 2008 Jonathan Martens <smeserver-contribs@snetram.nl>
-- 0.1-3
+- 0.1-4
 - Fixed httpd-e-smith restart command to use sv -t
 
 * Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
@@ -36,35 +89,25 @@ Implementation of mod_dav for SME Server
 %prep
 
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+mkdir -p root/var/run/davLocks/
 
 %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)
 rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist %buildroot > %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist %buildroot \
+    --dir /var/run/davLocks 'attr(0755,www,www)' \
+    > %{name}-%{version}-filelist
 
 %clean
 rm -rf %buildroot
 
-%post
-/etc/e-smith/events/actions/initialize-default-databases
-/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
-/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-/etc/e-smith/events/actions/navigation-conf
-/usr/bin/sv t httpd-e-smith
-
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)