From 8fedcc4046552f181b461995e5c5cedabfcd86e0 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 5 Apr 2005 21:36:50 +0000
Subject: [PATCH] 2.3.4-21

---
 fedora/branch.mk     | 4 ++--
 fedora/glibc.spec.in | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/fedora/branch.mk b/fedora/branch.mk
index d8f885a3c58..3403138b761 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,5 +1,5 @@
 # This file is updated automatically by Makefile.
 glibc-branch := fedora
 glibc-base := HEAD
-fedora-sync-date := 2005-04-01 14:44 UTC
-fedora-sync-tag := fedora-glibc-20050401T1444
+fedora-sync-date := 2005-04-05 21:14 UTC
+fedora-sync-tag := fedora-glibc-20050405T2114
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 69007cc66f2..f45e58748c2 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 20
+%define glibcrelease 21
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1260,6 +1260,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Apr  4 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-21
+- update from CVS
+  - fix xdr_rmtcall_args on 64-bit arches (#151686)
+- fix <pthread.h> and <bits/libc-lock.h> with -std=c89 -fexceptions (#153774)
+
 * Mon Apr  4 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-20
 - move LinuxThreads libraries to /%{_lib}/obsolete/linuxthreads/
   and NPTL libraries to /%{_lib}.  To run a program against LinuxThreads,
-- 
2.47.2