[blktool] install everything in /usr

[Harald Hoyer]

commit c87ac8c38cbf86e3cc4f36927d8f76c66f574bb1
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Jan 25 18:32:42 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.

 blktool.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/blktool.spec b/blktool.spec
index 158e63f..bd0d35d 100644
--- a/blktool.spec
+++ b/blktool.spec
@@ -1,6 +1,6 @@
 Name:		blktool
 Version:	4
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Block device settings tool
 
 Group:		Applications/System
@@ -10,8 +10,7 @@ URL:		http://sourceforge.net/projects/gkernel/
 Source0:	http://download.sourceforge.net/gkernel/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel
-
-%define _sbindir	/sbin
+Conflicts:      filesystem < 3
 
 %description
 This utility allows querying and changing of block device settings,
@@ -29,20 +28,20 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-mkdir -p %{buildroot}/usr/sbin
-ln -s /sbin/blktool %{buildroot}/usr/sbin
-
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING INSTALL NEWS README
-/sbin/blktool
-/usr/sbin/blktool
+%{_sbindir}/blktool
 %{_mandir}/man8/blktool.*
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 4-14
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild