From 933475051dc11c0898a34739790b5e0729683bea Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Wed, 4 Mar 2009 19:00:57 -0500
Subject: Fix up installation/use of /etc/davfs2/debuginfofs.conf

---
 debuginfofs.init | 2 +-
 debuginfofs.spec | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debuginfofs.init b/debuginfofs.init
index 88dbbd1..e8d63f2 100755
--- a/debuginfofs.init
+++ b/debuginfofs.init
@@ -42,7 +42,7 @@ start() {
 
         echo -n $"Starting debuginfofs: "
         mount -t davfs "$BUILDID_URL" "$BUILDID_MOUNTPOINT" \
-            -o ro,conf=/etc/davfs2/debuginfo.conf $MOUNT_ARGS
+            -o ro,conf=/etc/davfs2/debuginfofs.conf $MOUNT_ARGS
         RETVAL=$?
 
         [ $RETVAL -eq 0 ] && touch /var/lock/subsys/debuginfofs
diff --git a/debuginfofs.spec b/debuginfofs.spec
index 3c66c6e..23d3cbc 100644
--- a/debuginfofs.spec
+++ b/debuginfofs.spec
@@ -42,10 +42,9 @@ Server tools and config files for running a debuginfofs server
 %install
 rm -rf $RPM_BUILD_ROOT
 # client
-mkdir -p $RPM_BUILD_ROOT{%{_initrddir},/etc/sysconfig,/etc/davfs2}
-install -m 0755 debuginfofs.init $RPM_BUILD_ROOT%{_initrddir}/debuginfofs
-install -m 0644 debuginfofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/debuginfofs
-install -m 0644 davfs2-debuginfofs.conf $RPM_BUILD_ROOT/etc/davfs2
+install -D -m 0755 debuginfofs.init $RPM_BUILD_ROOT%{_initrddir}/debuginfofs
+install -D -m 0644 debuginfofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/debuginfofs
+install -D -m 0644 davfs2-debuginfofs.conf $RPM_BUILD_ROOT/etc/davfs2/debuginfofs.conf
 # server
 mkdir -p $RPM_BUILD_ROOT{/usr/share/debuginfofs,/usr/sbin}
 mkdir -p $RPM_BUILD_ROOT/var/{www,cache}/debuginfofs
@@ -89,6 +88,7 @@ fi
 %defattr(-,root,root,-)
 %doc README.client
 %{_initrddir}/debuginfofs
+%config(noreplace) /etc/davfs2/debuginfofs.conf
 %config(noreplace) /etc/sysconfig/debuginfofs
 
 %files server
-- 
cgit