summaryrefslogtreecommitdiff
path: root/fedora
diff options
context:
space:
mode:
Diffstat (limited to 'fedora')
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in8
2 files changed, 9 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index e3f3348c17..9f35fe0f79 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-fc4
-fedora-sync-date := 2006-03-06 12:39 UTC
-fedora-sync-tag := fedora-glibc-20060306T1239
+fedora-sync-date := 2006-03-28 09:00 UTC
+fedora-sync-tag := fedora-glibc-20060328T0900
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index c3c2c0de58..987ee270cb 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 4
+%define glibcrelease 5
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define prelinkarches noarch
%define xenarches i686 athlon
@@ -1336,6 +1336,12 @@ rm -f *.filelist*
%endif
%changelog
+* Tue Mar 28 Jakub Jelinek <jakub@redhat.com> 2.4-5
+- update from CVS
+ - pshared robust mutex support
+ - fix btowc and bwtoc in C++ (#186410)
+ - fix NIS+ (#186592)
+ - don't declare __wcsto*l_internal for non-GCC or if not -O1+ (#185667)
- don't mention nscd failures on 2.0 kernels (#185335)
* Tue Mar 7 2006 Roland McGrath <roland@redhat.com> 2.4-4