[davfs2] install everything in /usr

[Harald Hoyer]

commit b0a66a8ac9d6543af7723a0159df687f473f3cdf
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Jan 25 18:33:47 2012 +0100

    install everything in /usr
    
    This patch is needed for the /usr-move feature
    https://fedoraproject.org/wiki/Features/UsrMove
    
    This package requires now 'filesystem' >= 3, which is only installable
    on a system which has /bin, /sbin, /lib, /lib64 as symlinks to /usr and
    not regular directories. The 'filesystem' package acts as a guard, to
    prevent *this* package to be installed on old unconverted systems.
    
    New installations will have the 'filesystem' >=3 layout right away, old
    installations need to be converted with anaconda or dracut first; only
    after that, the 'filesystem' package, and also *this* package can be
    installed.
    
    Packages *should* not install files in /bin, /sbin, /lib, /lib64, but
    only in the corresponding directories in /usr. Packages *must* not
    install conflicting files with the same names in the corresponding
    directories in / and /usr. Especially compatibilty symlinks must not be
    installed.
    
    Feel free to modify any of the changes to the spec file, but keep the
    above in mind.

 davfs2.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/davfs2.spec b/davfs2.spec
index b2ee1d4..119a212 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -1,6 +1,6 @@
 Name:           davfs2
 Version:        1.4.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A filesystem driver for WebDAV
 Group:          System Environment/Base
 License:        GPLv2+
@@ -8,6 +8,7 @@ URL:            http://savannah.nongnu.org/projects/davfs2
 Source0:        http://download.savannah.gnu.org/releases/davfs2/davfs2-1.4.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Conflicts:      filesystem < 3
 BuildRequires:  neon-devel gettext
 Requires(pre):  shadow-utils
 
@@ -24,7 +25,7 @@ as a disk drive.
 %setup -q
 
 %build
-%configure
+%configure ssbindir=%{_sbindir}
 make
 
 
@@ -34,9 +35,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 # Create directories used by mount.davfs
 install -d $RPM_BUILD_ROOT%{cachedir} $RPM_BUILD_ROOT%{piddir}
-# Fix symlinks
-ln -sf ../usr/sbin/mount.davfs $RPM_BUILD_ROOT/sbin/mount.davfs
-ln -sf ../usr/sbin/umount.davfs $RPM_BUILD_ROOT/sbin/umount.davfs
 # 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?)
@@ -82,15 +80,16 @@ exit 0
 %{_sbindir}/umount.davfs
 # re-apply suid bit to mount.davfs
 %attr (4755,root,root) %{_sbindir}/mount.davfs
-# symlinks to files in %{_sbindir}
-/sbin/mount.davfs
-/sbin/umount.davfs
 
 # Extra dirs needed by mount.davfs
 %dir %attr(00775,root,%{groupname}) %{cachedir}
 %dir %attr(01775,root,%{groupname}) %{piddir}
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 1.4.6-3
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild