2.9.90-4

1 files changed, 31 insertions, 8 deletions

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 515d87441c..c7eb9e8db0 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -19,7 +19,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: @glibcversion@
-Release: 3
+Release: 4
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -114,14 +114,24 @@ executables.
 Install glibc-devel if you are going to develop programs which will
 use the standard C libraries.
 
+%package static
+Summary: C library static libraries for -static linking.
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+The glibc-static package contains the C library static libraries
+for -static linking.  You don't need these, unless you link statically,
+which is highly discouraged.
+
 %package headers
 Summary: Header files for development using standard C libraries.
 Group: Development/Libraries
 Provides: %{name}-headers(%{_target_cpu})
 %ifarch x86_64
 # If both -m32 and -m64 is to be supported on AMD64, x86_64 glibc-headers
-# have to be installed, not i386 ones.
-Obsoletes: %{name}-headers(i386)
+# have to be installed, not i586 ones.
+Obsoletes: %{name}-headers(i586)
 %endif
 Requires(pre): kernel-headers
 Requires: kernel-headers >= 2.2.1, %{name} = %{version}-%{release}
@@ -249,7 +259,7 @@ BuildFlags="-march=%{nptl_target_cpu} -mtune=generic"
 %ifarch i686
 BuildFlags="-march=i686 -mtune=generic"
 %endif
-%ifarch i386
+%ifarch i386 i486 i586
 BuildFlags="$BuildFlags -mno-tls-direct-seg-refs"
 %endif
 %ifarch x86_64
@@ -346,7 +356,7 @@ build_nptl linuxnptl-power6
 cd build-%{nptl_target_cpu}-linuxnptl
 $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \
   -DNO_SIZE_OPTIMIZATION \
-%ifarch i386
+%ifarch i386 i486 i586
   -DARCH_386 \
 %endif
   '-DLIBTLS="/%{_lib}/tls/"' \
@@ -588,7 +598,12 @@ mv rpm.filelist rpm.filelist.full
 grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full |
   egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist
 
-grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist >> devel.filelist
+grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \
+  | grep -v '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \
+  >> devel.filelist
+grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \
+  | grep '/lib\(\(c\|pthread\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \
+  > static.filelist
 grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist
 grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist
 
@@ -762,7 +777,7 @@ list_debug_archives()
 %ifarch %{debuginfocommonarches}
 
 %ifarch %{ix86}
-%define basearch i386
+%define basearch i586
 %endif
 %ifarch alpha alphaev6
 %define basearch alpha
@@ -809,7 +824,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 echo Cutting down the list of unpackaged files
 >> debuginfocommon.filelist
 sed -e '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //;s#^/*##' \
-    common.filelist devel.filelist headers.filelist \
+    common.filelist devel.filelist static.filelist headers.filelist \
     utils.filelist nscd.filelist debuginfocommon.filelist |
 (cd $RPM_BUILD_ROOT; xargs --no-run-if-empty rm -f 2> /dev/null || :)
 
@@ -947,6 +962,9 @@ rm -f *.filelist*
 %files -f devel.filelist devel
 %defattr(-,root,root)
 
+%files -f static.filelist static
+%defattr(-,root,root)
+
 %files -f headers.filelist headers
 %defattr(-,root,root)
 
@@ -984,6 +1002,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Feb 18 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-4
+- update from trunk
+- adjust for i586 + i686 from i386 + i686 build
+- split static libraries into glibc-static subpackage
+
 * Wed Feb  4 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-3
 - update from trunk
   - ISO C++ compliant strchr etc. with GCC 4.4+