[ethtool] install everything in /usr

[Harald Hoyer]

commit 053a9654efb3a5c4f3ab7bb0b547d2bccab08fdb
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Jan 25 18:36:27 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.

 ethtool.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/ethtool.spec b/ethtool.spec
index 8d92329..cd77a31 100644
--- a/ethtool.spec
+++ b/ethtool.spec
@@ -1,7 +1,7 @@
 Name:		ethtool
 Epoch:		2
 Version:	3.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Settings tool for Ethernet NICs
 
 License:	GPLv2
@@ -19,6 +19,7 @@ URL:		http://sourceforge.net/projects/gkernel/
 # - Use the visible date of latest git log entry for %{release} in spec file
 Source0:	http://ftp.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.bz2
 BuildRequires:	automake, autoconf
+Conflicts:      filesystem < 3
 
 %description
 This utility allows querying and changing settings such as speed,
@@ -35,23 +36,22 @@ network devices, especially of Ethernet devices.
 # autoconf
 
 %build
-%configure --sbindir=/sbin
+%configure
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} INSTALL='install -p' install
 
-# Some legacy support for scripts etc. out there
-mkdir -p %{buildroot}%{_sbindir}
-ln -sf ../../sbin/%{name} %{buildroot}%{_sbindir}/%{name}
-
 %files
 %doc AUTHORS ChangeLog* COPYING LICENSE NEWS README
-/sbin/%{name}
 %{_sbindir}/%{name}
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 2:3.2-2
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Fri Jan 13 2012 Jaromir Capik <jcapik at redhat.com> 2:3.2-1
 - Update to 3.2 (#781357)
 - Minor spec file changes according to the latest guidelines