[davfs2] Fix a couple packaging problems (#656570, #783788)
Will Woods
wwoods at fedoraproject.org
Sat Jun 2 18:42:50 UTC 2012
commit f7980229d10a2ceeaad165615d12be4e6cff3e09
Author: Will Woods <wwoods at redhat.com>
Date: Sat Jun 2 14:16:41 2012 -0400
Fix a couple packaging problems (#656570, #783788)
As per https://fedoraproject.org/wiki/Features/var-run-tmpfs,
/var/cache/davfs2 and /var/run/mount.davfs should be marked %ghost.
Also, the "duplicate" config files in /usr/share/davfs2 were actually
used as templates for local configuration. My mistake!
davfs2.spec | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/davfs2.spec b/davfs2.spec
index 119a212..2da94a8 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -1,6 +1,6 @@
Name: davfs2
Version: 1.4.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A filesystem driver for WebDAV
Group: System Environment/Base
License: GPLv2+
@@ -37,8 +37,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{cachedir} $RPM_BUILD_ROOT%{piddir}
# Don't need this - we'll do our own doc install, thanks
rm -rf $RPM_BUILD_ROOT/usr/share/doc/davfs2
-# Remove duplicate files. (Why is it installing these in the first place?)
-rm -rf $RPM_BUILD_ROOT/usr/share/davfs2 # same files in /etc/davfs2
# Remove suid bit, to work around a problem with brp-strip on suid binaries
chmod 0755 $RPM_BUILD_ROOT/%{_sbindir}/mount.davfs
# UTF8ify translated man pages
@@ -75,6 +73,8 @@ exit 0
%dir %{_sysconfdir}/davfs2/certs/private/
%dir %{_sysconfdir}/davfs2/certs/
%dir %{_sysconfdir}/davfs2/
+%dir %{_datarootdir}/davfs2/
+%{_datarootdir}/davfs2/*
# Binaries
%{_sbindir}/umount.davfs
@@ -82,10 +82,14 @@ exit 0
%attr (4755,root,root) %{_sbindir}/mount.davfs
# Extra dirs needed by mount.davfs
-%dir %attr(00775,root,%{groupname}) %{cachedir}
-%dir %attr(01775,root,%{groupname}) %{piddir}
+%ghost %dir %attr(00775,root,%{groupname}) %{cachedir}
+%ghost %dir %attr(01775,root,%{groupname}) %{piddir}
%changelog
+* Sat Jun 2 2012 Will Woods <wwoods at redhat.com> 1.4.6-4
+- Mark /var/cache/davfs2 and /var/run/mount.davfs %ghost (#656570)
+- Fix 'cannot stat `/usr/share/davfs2/davfs2.conf'' warning (#783788)
+
* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 1.4.6-3
- install everything in /usr
https://fedoraproject.org/wiki/Features/UsrMove
More information about the scm-commits
mailing list