Reorganize the middle of the install phase.

The middle of the install phase is now clearly split into:
* Remove files we don't distribute.
* Install info files.
* Install locale files.
* Install configuration files for services.
* Install debug copies of unstripped static libs.
* Miscellaneous.

glibc.spec

@@ -826,14 +826,18 @@ popd
 rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libNoVersion*
 rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion*
 
-# NPTL <bits/stdio-lock.h> is not usable outside of glibc, so include
+# rquota.x and rquota.h are now provided by quota
-# the generic one (#162634)
+rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx]
-cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
+
-# And <bits/libc-lock.h> needs sanitizing as well.
+# In F7+ this is provided by rpcbind rpm
-cp -a releng/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h
+rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo
+
+# Remove the old nss modules.
+rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-*
+rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1
 
 ##############################################################################
-# Adjust info files
+# Install info files
 ##############################################################################
 
 # Move the info files if glibc installed them into the wrong location.
@@ -846,8 +850,26 @@ fi
 # Compress all of the info files.
 gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc*
 
-# XXX: What is this for?
+##############################################################################
-ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a
+# Install locale files
+##############################################################################
+
+# Create archive of locale files
+%ifnarch %{auxarches}
+olddir=`pwd`
+pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
+rm locale-archive || :
+# Intentionally we do not pass --alias-file=, aliases will be added
+# by build-locale-archive.
+$olddir/build-%{target}/elf/ld.so \
+  --library-path $olddir/build-%{target}/ \
+  $olddir/build-%{target}/locale/localedef \
+    --prefix ${RPM_BUILD_ROOT} --add-to-archive \
+    *_*
+rm -rf *_*
+mv locale-archive{,.tmpl}
+popd
+%endif
 
 ##############################################################################
 # Install configuration files for services
@@ -882,12 +904,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 > $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
 chmod 644 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
 
-# Install the upgrade program
-install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \
-  $RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu}
-
-strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
-
 ##############################################################################
 # Install debug copies of unstripped static libraries
 ##############################################################################
@@ -901,40 +917,29 @@ cp -a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.a \
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib/debug%{_prefix}/%{_lib}/*_p.a
 %endif
 
-# rquota.x and rquota.h are now provided by quota
-rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx]
-
 ##############################################################################
-# Install locale files
+# Misc...
 ##############################################################################
 
-# Create archive of locale files
+# NPTL <bits/stdio-lock.h> is not usable outside of glibc, so include
-%ifnarch %{auxarches}
+# the generic one (#162634)
-olddir=`pwd`
+cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
-pushd ${RPM_BUILD_ROOT}%{_prefix}/lib/locale
+# And <bits/libc-lock.h> needs sanitizing as well.
-rm locale-archive || :
+cp -a releng/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h
-# Intentionally we do not pass --alias-file=, aliases will be added
-# by build-locale-archive.
-$olddir/build-%{target}/elf/ld.so \
-  --library-path $olddir/build-%{target}/ \
-  $olddir/build-%{target}/locale/localedef \
-    --prefix ${RPM_BUILD_ROOT} --add-to-archive \
-    *_*
-rm -rf *_*
-mv locale-archive{,.tmpl}
-popd
-%endif
 
-# Remove the old nss modules.
+# XXX: What is this for?
-rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-*
+ln -sf libbsd-compat.a $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libbsd.a
-rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1
 
-# Ugly hack for buggy rpm
+# Install the upgrade program
+install -m 700 build-%{target}/glibc_post_upgrade.%{_target_cpu} \
+  $RPM_BUILD_ROOT/usr/sbin/glibc_post_upgrade.%{_target_cpu}
+
+# Strip all of the installed object files.
+strip -g $RPM_BUILD_ROOT%{_prefix}/%{_lib}/*.o
+
+# XXX: Ugly hack for buggy rpm. What bug? BZ? Is this fixed?
 ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}}
 
-# In F7+ this is provided by rpcbind rpm
-rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo
-
 ##############################################################################
 # Build the file lists used for describing the package and subpackages.
 ##############################################################################