From 72a0b8bef402d850479f022e561ceed88e813378 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 25 Jan 2012 14:09:06 +0100
Subject: [PATCH] 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.
---
 findutils.spec | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/findutils.spec b/findutils.spec
index c693117..7e7a587 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs)
 Name: findutils
 Version: 4.5.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv3+
 Group: Applications/File
@@ -25,6 +25,9 @@ Patch4: findutils-4.5.7-warnings.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
+#Conflicts: filesystem < 3
+Provides: /bin/find
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: automake
 BuildRequires: dejagnu
@@ -74,13 +77,6 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}
 
-# move find to /bin/find
-mkdir -p $RPM_BUILD_ROOT/bin
-mv $RPM_BUILD_ROOT{%_bindir,/bin}/find
-
-# create /usr/bin/find -> /bin/find symlink
-ln -sf ../../bin/find $RPM_BUILD_ROOT/usr/bin
-
 %post
 if [ -f %{_infodir}/find.info.gz ]; then
   /sbin/install-info %{_infodir}/find.info.gz %{_infodir}/dir || :
@@ -99,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README THANKS TODO ChangeLog
-/bin/find
 %{_bindir}/find
 %{_bindir}/oldfind
 %{_bindir}/xargs
@@ -109,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/find-maint.info.gz
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 1:4.5.10-3
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.5.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild