From 48664b95f6328b7e87c437f5648c7a25a9c93500 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 05:23:16 +0000
Subject: auto-import glibc-2.2.4-26 from glibc-2.2.4-26.src.rpm


---

diff --git a/glibc.spec b/glibc.spec
index adfb115..8f3eb71 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,9 +1,9 @@
-%define glibcrelease 24.2
+%define glibcrelease 26
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 Summary: The GNU libc libraries.
 Name: glibc
 Version: 2.2.4
-Release: %{glibcrelease}s.1
+Release: %{glibcrelease}
 Copyright: LGPL
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tar.bz2
@@ -23,6 +23,10 @@ Provides: ld.so.2
 Obsoletes: libc
 %endif
 Prereq: basesystem
+%ifarch i686
+BuildPreReq: libaio-devel >= 0.3.8
+Requires: libredhat-kernel.so.1
+%endif
 # This is for building auxiliary programs like memusage
 # For initial glibc bootstraps it can be commented out
 BuildPreReq: gd-devel libpng-devel zlib-devel
@@ -39,12 +43,13 @@ Conflicts: rpm <= 4.0-0.65
 Conflicts: glibc-devel < 2.2.3
 Patch: glibc-kernel-2.4.patch
 Patch2: glibc-2.2.4.patch
+Source2: glibc-aio.patch
 Patch3: glibc-2.2.4-fixes.patch
 Patch4: glibc-2.2.4-s390.patch
 Patch5: glibc-2.2.4-i386-postupgrade.patch
 Patch6: glibc-2.2.4-s390-2.patch
-Patch7: glibc-2.2.4-s390-3.patch
-Patch8: glibc-2.2.4-bigendian.patch
+Patch7: glibc-2.2.4-sunrpc.patch
+Patch8: glibc-2.2.4-collate.patch
 %ifarch ia64 sparc64 s390x
 Conflicts: kernel < 2.4.0
 %define enablekernel 2.4.0
@@ -240,6 +245,7 @@ cd build-%{_target_cpu}-linux && \
 
 %ifarch i686
 rm -rf build-%{_target_cpu}-linux2.4
+patch -z .aio -b -p1 -E < %{SOURCE2}
 mkdir build-%{_target_cpu}-linux2.4 ; cd build-%{_target_cpu}-linux2.4
 GCC=gcc
 BuildFlags=`cat ../BuildFlags`
@@ -259,11 +265,13 @@ make -j$numprocs -r CFLAGS="$BuildFlags -g -O3" PARALLELMFLAGS=-s
 mkdir -p $RPM_BUILD_ROOT/lib/%{_target_cpu}/
 cp -a libc.so $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libc-*.so`
 ln -sf `basename $RPM_BUILD_ROOT/lib/libc-*.so` $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libc.so.*`
+cp -a rt/librt.so $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/librt-*.so`
+ln -sf `basename $RPM_BUILD_ROOT/lib/librt-*.so` $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/librt.so.*`
 cp -a math/libm.so $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libm-*.so`
 ln -sf `basename $RPM_BUILD_ROOT/lib/libm-*.so` $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libm.so.*`
 cp -a linuxthreads/libpthread.so $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libpthread-*.so`
 ln -sf `basename $RPM_BUILD_ROOT/lib/libpthread-*.so` $RPM_BUILD_ROOT/lib/%{_target_cpu}/`basename $RPM_BUILD_ROOT/lib/libpthread.so.*`
-strip -R .comment $RPM_BUILD_ROOT/lib/{libc,libm,libpthread}-*.so
+strip -R .comment $RPM_BUILD_ROOT/lib/{libc,libm,libpthread,librt}-*.so
 cd ..
 %endif
 
@@ -425,6 +433,18 @@ cp timezone/README documentation/README.timezone
 cp ChangeLog* documentation
 gzip -9 documentation/ChangeLog*
 
+echo ====================TESTING=========================
+cd build-%{_target_cpu}-linux
+make -j$numprocs -k check PARALLELMFLAGS=-s || :
+cd ..
+%ifarch i686 athlon
+echo ====================TESTING OPTIMIZED===============
+cd build-%{_target_cpu}-linux2.4
+make -j$numprocs -k check PARALLELMFLAGS=-s || :
+cd ..
+%endif
+echo ====================TESTING END=====================
+
 %post -p /usr/sbin/glibc_post_upgrade
 
 %postun -p /sbin/ldconfig
@@ -499,14 +519,14 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Wed Mar 18 2003 D. Marlin <dmarlin@redhat.com>
-- new s390 release number and rebuild for s390 (bug #85960)
+* Tue Apr 23 2002 Jakub Jelinek <jakub@redhat.com> 2.2.4-26
+- use uninterposable sendto/recvfrom/recvmsg in RPC when
+  working on sockets opened through uninterposable socket (#63382)
+- fix zh_TW sorting (#63692)
+- run make check during build process
 
-* Tue Apr 16 2002 Phil Knirsch <pknirsch@redhat.com>
-- Fixed 64bit bigendian problem in sunrpc code.
-
-* Sat Apr 13 2002 Florian La Roche <Florian.LaRoche@redhat.de>
-- add missing s390/s390x patches
+* Tue Apr  9 2002 Jakub Jelinek <jakub@redhat.com> 2.2.4-25
+- rebuilt with kernel aio
 
 * Tue Apr  2 2002 Jakub Jelinek <jakub@redhat.com> 2.2.4-24
 - remove nice(2) return value fix - too many apps broken,
@@ -524,6 +544,9 @@ rm -f *.filelist*
 - remove /lib/i686/ libraries in glibc_post_upgrade when
   performing i386 glibc install
 
+* Sat Jan 26 2002 Jakub Jelinek <jakub@redhat.com> 2.2.4-19.4
+- use kernel aio in /lib/i686/librt*
+
 * Sat Dec  8 2001 Jakub Jelinek <jakub@redhat.com> 2.2.4-19.3
 - fix inttypes.h typo (#57268)