From 2e3cbbc31c01e11e39a269f1603096b4b228723c Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 05:28:20 +0000
Subject: auto-import glibc-2.2.5-36 from glibc-2.2.5-36.src.rpm


---

diff --git a/.cvsignore b/.cvsignore
index 17d63cd..063b70e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 glibc-2.2.5.tar.bz2
-prelink-20020326.tar.bz2
+prelink-20020617.tar.bz2
diff --git a/glibc.spec b/glibc.spec
index 101530e..ca07d5f 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,7 +1,7 @@
-%define glibcrelease 34.1
+%define glibcrelease 36
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches i686 athlon alpha alphaev6
-%define prelinkdate 20020326
+%define prelinkdate 20020617
 Summary: The GNU libc libraries.
 Name: glibc
 Version: 2.2.5
@@ -28,11 +28,11 @@ BuildPreReq: gd-devel libpng-devel zlib-devel
 BuildPreReq: libelf >= 0.7.0-2
 # This is to ensure that __frame_state_for exported by glibc
 # will be compatible with egcs 1.x.y
+BuildPreReq: gcc >= 2.96-84
 Conflicts: rpm <= 4.0-0.65
 Conflicts: glibc-devel < 2.2.3
 Patch: glibc-kernel-2.4.patch
-Patch1: glibc-2.2.4-s390-2.patch
-Patch2: glibc-2.2.4-s390-3.patch
+Patch2: glibc-2.2.5.patch
 %ifarch ia64 sparc64 s390x
 Conflicts: kernel < 2.4.0
 %define enablekernel 2.4.0
@@ -185,7 +185,6 @@ case `uname -r` in
 %enablemask)
 %patch -p1
 ;; esac
-%patch1 -p1
 %patch2 -p1
 
 %ifarch %{prelinkarches}
@@ -309,7 +308,7 @@ cd ..
 
 %ifarch %{prelinkarches}
 # Build prelink
-cd prelink/prelink-%{prelinkdate}
+cd prelink/prelink
 %configure
 make
 cd ../..
@@ -429,9 +428,9 @@ cd prelink
 > prelink.conf
 # For now disable prelinking of ld.so, as it breaks statically linked
 # binaries built against non-NDEBUG old glibcs (assert unknown dynamic tag)
-# prelink-%{prelinkdate}/src/prelink -c ./prelink.conf -C ./prelink.cache \
+# prelink/src/prelink -c ./prelink.conf -C ./prelink.cache \
 #  --mmap-region-start=0x40000000 $RPM_BUILD_ROOT/%{_lib}/ld-*.so
-prelink-%{prelinkdate}/src/prelink --reloc-only=0x42000000 \
+prelink/src/prelink --reloc-only=0x42000000 \
   $RPM_BUILD_ROOT/%{_lib}/i686/libc-*.so
 cd ..
 %endif
@@ -441,9 +440,9 @@ cd prelink
 > prelink.conf
 # For now disable prelinking of ld.so, as it breaks statically linked
 # binaries built against non-NDEBUG old glibcs (assert unknown dynamic tag)
-# prelink-%{prelinkdate}/src/prelink -c ./prelink.conf -C ./prelink.cache \
+# prelink/src/prelink -c ./prelink.conf -C ./prelink.cache \
 #  --mmap-region-start=0x0000020000000000 $RPM_BUILD_ROOT/%{_lib}/ld-*.so
-prelink-%{prelinkdate}/src/prelink --reloc-only=0x0000020010000000 \
+prelink/src/prelink --reloc-only=0x0000020010000000 \
   $RPM_BUILD_ROOT/%{_lib}/libc-*.so
 cd ..
 %endif
@@ -655,6 +654,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Jun 18 2002 Jakub Jelinek <jakub@redhat.com> 2.2.5-35
+- fix nice return value
+- fix __moddi3 (#65612, #65695)
+- export get*ent_r@@GLIBC_2.1.2 symbols (#66278)
+- update prelink to fix prelink -r on alpha
+
 * Mon Apr 15 2002 Jakub Jelinek <jakub@redhat.com> 2.2.5-34
 - add relocation dependencies even for weak symbols (#63422)
 - stricter check_fds check for suid/sgid binaries
diff --git a/sources b/sources
index e5e63bc..1cfaed6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 5f2c374a3a98e349e074f4ded6f007ba  glibc-2.2.5.tar.bz2
-c44995bb021692b62c250fee1c9a19b2  prelink-20020326.tar.bz2
+11f194948cbbd8be9bd5e1b97a11c51e  prelink-20020617.tar.bz2