[nspr] install everything in /usr

[Harald Hoyer]

commit 6f4a15758c9f5325e58a8c8913343e62ec84971a
Author: Harald Hoyer <harald at redhat.com>
Date:   Wed Jan 25 21:23:59 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 compatibility symlinks must not be
    installed.
    
    Feel free to modify any of the changes to the spec file, but keep the
    above in mind.

 nspr.spec |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/nspr.spec b/nspr.spec
index 2b243e8..358544e 100644
--- a/nspr.spec
+++ b/nspr.spec
@@ -1,11 +1,12 @@
 Summary:        Netscape Portable Runtime
 Name:           nspr
 Version:        4.9
-Release:        0.2%{?dist}.beta3
+Release:        0.2%{?dist}.beta3.1
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 URL:            http://www.mozilla.org/projects/nspr/
 Group:          System Environment/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+Conflicts:      filesystem < 3
 
 # Sources available at ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/
 # When CVS tag based snapshots are being used, refer to CVS documentation on
@@ -27,6 +28,7 @@ Summary:        Development libraries for the Netscape Portable Runtime
 Group:          Development/Libraries
 Requires:       nspr = %{version}-%{release}
 Requires:       pkgconfig
+Conflicts:      filesystem < 3
 
 %description devel
 Header files for doing development with the Netscape Portable Runtime.
@@ -101,7 +103,6 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
                      $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/nspr.pc
 
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_bindir}
-%{__mkdir_p} $RPM_BUILD_ROOT/%{_lib}
 %{__cp} ./config/nspr-config-pc $RPM_BUILD_ROOT/%{_bindir}/nspr-config
 
 # Get rid of the things we don't want installed (per upstream)
@@ -114,13 +115,6 @@ cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
    $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \
    $RPM_BUILD_ROOT/%{_includedir}/nspr4/md
 
-for file in libnspr4.so libplc4.so libplds4.so
-do
-  mv -f $RPM_BUILD_ROOT/%{_libdir}/$file $RPM_BUILD_ROOT/%{_lib}/$file
-  ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
-done
-
-
 %clean
 %{__rm} -Rf $RPM_BUILD_ROOT
 
@@ -130,20 +124,24 @@ done
 
 %files
 %defattr(-,root,root)
-/%{_lib}/libnspr4.so
-/%{_lib}/libplc4.so
-/%{_lib}/libplds4.so
-
-%files devel
-%defattr(-, root, root)
 %{_libdir}/libnspr4.so
 %{_libdir}/libplc4.so
 %{_libdir}/libplds4.so
+
+%files devel
+%defattr(-, root, root)
 %{_includedir}/nspr4
 %{_libdir}/pkgconfig/nspr.pc
 %{_bindir}/nspr-config
 
 %changelog
+* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 4.9-0.2.beta3.1
+- install everything in /usr
+  https://fedoraproject.org/wiki/Features/UsrMove
+
+* Wed Jan 25 2012 Harald Hoyer <harald at redhat.com> 4.9-0.2.beta3.1
+- 
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.9-0.2.beta3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild