--- rpms/smeserver-mod_dav/contribs7/smeserver-mod_dav.spec	2008/08/23 08:05:50	1.13
+++ rpms/smeserver-mod_dav/contribs7/smeserver-mod_dav.spec	2009/02/28 12:28:56	1.21
@@ -1,10 +1,10 @@
-# $Id: smeserver-mod_dav.spec,v 1.12 2008/08/14 06:33:07 snetram Exp $
+# $Id: smeserver-mod_dav.spec,v 1.20 2008/11/25 16:20:26 slords Exp $
 # Authority: snetram
 # Name: Jonathan Martens
 
 %define name smeserver-mod_dav
 %define version 0.1
-%define release 12
+%define release 17
 
 Summary: SME Server mod_dav implementation
 Name: %{name}
@@ -17,6 +17,8 @@ Patch1: smeserver-mod_dav-0.1-initdb.pat
 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
+Patch6: smeserver-mod_dav-0.1-fixHttpdErrorWhenDisabled.patch
 
 BuildArchitectures: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -27,6 +29,22 @@ BuildRequires: e-smith-devtools >= 1.13.
 Implementation of mod_dav for SME Server 7.
 
 %changelog
+* Sat Feb 28 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 0.1-17
+- Do not set DAVLock when module is disabled and not loaded [SME: 5039]
+
+* 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]
 
@@ -79,8 +97,9 @@ Implementation of mod_dav for SME Server
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-mkdir -p root/var/run/DAVLocks/
-touch root/var/run/DAVLocks/davLock
+%patch5 -p1
+%patch6 -p1
+mkdir -p root/var/run/davLocks/
 
 %build
 
@@ -88,11 +107,12 @@ touch root/var/run/DAVLocks/davLock
 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
 
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
-%attr(-,www,www) /var/run/DAVLocks/davLock