From a370a4e392c254a17d17af332ccd4b8b7e0a8fbb Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 25 Jan 2012 19:34:41 +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 compatibility symlinks must not be
installed.

Feel free to modify any of the changes to the spec file, but keep the
above in mind.
---
 bash.spec | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/bash.spec b/bash.spec
index aa24474..6c98212 100644
--- a/bash.spec
+++ b/bash.spec
@@ -6,7 +6,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Shells
 License: GPLv3+
 Url: http://www.gnu.org/software/bash
@@ -78,6 +78,9 @@ Patch121: bash-4.2-coverity.patch
 BuildRequires: texinfo bison
 BuildRequires: ncurses-devel
 BuildRequires: autoconf, gettext
+Conflicts: filesystem < 3
+Provides: /bin/sh
+Provides: /bin/bash
 
 %description
 The GNU Bourne Again shell (Bash) is a shell or command language
@@ -203,12 +206,8 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/printf.1
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/true.1
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/false.1
 
-pushd $RPM_BUILD_ROOT
-mkdir ./bin
-mv ./usr/bin/bash ./bin
-ln -sf bash ./bin/sh
-rm -f .%{_infodir}/dir
-popd
+ln -sf bash $RPM_BUILD_ROOT%{_bindir}/sh
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 mkdir -p $RPM_BUILD_ROOT/etc/skel
 install -c -m644 %SOURCE1 $RPM_BUILD_ROOT/etc/skel/.bashrc
 install -c -m644 %SOURCE2 $RPM_BUILD_ROOT/etc/skel/.bash_profile
@@ -298,8 +297,8 @@ end
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config(noreplace) /etc/skel/.b*
-/bin/sh
-/bin/bash
+%{_bindir}/sh
+%{_bindir}/bash
 %dir %{pkgdocdir}/
 %doc %{pkgdocdir}/COPYING
 %attr(0755,root,root) %{_bindir}/bashbug-*
@@ -314,6 +313,10 @@ end
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 4.2.20-4
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild