From adddea9da3bc75fd96aafd6a8d0622e21798da4d Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 25 Jan 2012 19:10:13 +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.
---
 plymouth.spec | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/plymouth.spec b/plymouth.spec
index aa8df65..e78c5eb 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -1,12 +1,12 @@
-%define plymouthdaemon_execdir /sbin
-%define plymouthclient_execdir /bin
-%define plymouth_libdir /%{_lib}
+%define plymouthdaemon_execdir %{_sbindir}
+%define plymouthclient_execdir %{_bindir}
+%define plymouth_libdir %{_libdir}
 %define plymouth_initrd_file /boot/initrd-plymouth.img
 
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.4
-Release: 0.20110810.3%{?dist}
+Release: 0.20110810.4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -21,6 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: system-logos
 Requires(post): plymouth-scripts
 Requires: initscripts >= 8.83-1
+Conflicts: filesystem < 3
 
 BuildRequires: pkgconfig(libdrm)
 BuildRequires: pkgconfig(libdrm_intel)
@@ -247,7 +248,7 @@ sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
            --with-background-color=0x3391cd                      \
            --disable-gdm-transition                              \
            --enable-systemd-integration                          \
-           --with-system-root-install                            \
+           --without-system-root-install                         \
            --with-rhgb-compat-link                               \
            --without-log-viewer
 
@@ -265,9 +266,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/plymouth/glow.so
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
-# Temporary symlink until rc.sysinit is fixed
-(cd $RPM_BUILD_ROOT%{_bindir}; ln -s ../../bin/plymouth)
-
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
 cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration
 cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth
@@ -496,6 +494,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 0.8.4-0.20110810.4
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.4-0.20110810.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild