From 7bb4ea376d2987ccb280c103e4f3c1d3f43bbfcb Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 25 Jan 2012 14:13:39 +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.
---
 gzip.spec | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gzip.spec b/gzip.spec
index ab0645d..a0ab365 100644
--- a/gzip.spec
+++ b/gzip.spec
@@ -1,7 +1,7 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 # info pages are under GFDL license
 License: GPLv3+ and GFDL
 Group: Applications/File
@@ -25,6 +25,10 @@ URL: http://www.gzip.org/
 Requires: /sbin/install-info
 Requires: coreutils
 BuildRequires: texinfo
+#Conflicts: filesystem < 3
+Provides: /bin/gunzip
+Provides: /bin/gzip
+Provides: /bin/zcat
 
 %description
 The gzip package contains the popular GNU gzip data compression
@@ -49,28 +53,21 @@ very commonly used data compression program.
 %build
 export DEFS="NO_ASM"
 export CPPFLAGS="-DHAVE_LSTAT"
-%configure  --bindir=/bin
+%configure 
 
 make
 #make gzip.info
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall  bindir=${RPM_BUILD_ROOT}/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
-ln -sf ../../bin/gzip ${RPM_BUILD_ROOT}%{_bindir}/gzip
-ln -sf ../../bin/gunzip ${RPM_BUILD_ROOT}%{_bindir}/gunzip
-
-for i in  zcmp zegrep zforce zless znew gzexe zdiff zfgrep zgrep zmore ; do
-    mv ${RPM_BUILD_ROOT}/bin/$i ${RPM_BUILD_ROOT}%{_bindir}/$i
-done
+%makeinstall 
 
 gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/gzip.info*
 
 # we don't ship it, so let's remove it from ${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 # uncompress is a part of ncompress package
-rm -f ${RPM_BUILD_ROOT}/bin/uncompress
+rm -f ${RPM_BUILD_ROOT}/%{_bindir}/uncompress
 
 %post
 if [ -f %{_infodir}/gzip.info* ]; then
@@ -87,12 +84,15 @@ fi
 %files
 %defattr(-,root,root)
 %doc NEWS README AUTHORS ChangeLog THANKS TODO
-/bin/*
 %{_bindir}/*
 %{_mandir}/*/*
 %{_infodir}/gzip.info*
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald@redhat.com> 1.4-5
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild