[gettext] install everything in /usr

[Harald Hoyer]

commit e52ad18890e20e512621b1e0197ed37e452d5973
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Jan 25 14:12:19 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.

 gettext.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index 5ec694d..594187b 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -6,7 +6,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.18.1.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -43,6 +43,8 @@ BuildRequires: libcroco-devel
 BuildRequires: libunistring-devel
 Requires(post): info
 Requires(preun): info
+#Conflicts: filesystem < 3
+Provides: /bin/gettext
 Patch1: gettext-readlink-einval.patch
 
 %description
@@ -160,10 +162,6 @@ make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="%{__install} -p" \
     lispdir=%{_datadir}/emacs/site-lisp/gettext \
     aclocaldir=%{_datadir}/aclocal EXAMPLESFILES=""
 
-# move gettext to /bin
-mkdir -p ${RPM_BUILD_ROOT}/bin
-mv ${RPM_BUILD_ROOT}%{_bindir}/gettext ${RPM_BUILD_ROOT}/bin
-ln -s ../../bin/gettext ${RPM_BUILD_ROOT}%{_bindir}/gettext
 
 install -pm 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/msghack
 
@@ -270,7 +268,7 @@ fi
 %doc NEWS THANKS 
 %doc gettext-runtime/man/*.1.html
 %doc gettext-runtime/intl/COPYING*
-/bin/*
+%{_bindir}/*
 %exclude %{_bindir}/autopoint
 %{_bindir}/*
 %{_infodir}/gettext*
@@ -333,6 +331,10 @@ fi
 %{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 0.18.1.1-11
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
 * Tue Jan 10 2012 Nils Philippsen <nils at redhat.com> - 0.18.1.1-10
 - rebuild for gcc 4.7