summaryrefslogtreecommitdiff
path: root/fedora
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-10-02 19:02:41 +0000
committerJakub Jelinek <jakub@redhat.com>2006-10-02 19:02:41 +0000
commit16d1b47b4f3f9ae13535ea7a2c02bd207c069d5c (patch)
tree975d67b5fe35279f3f4834b4c345b18b927a57b9 /fedora
parentaf47bc499af76c844b28d9ca912ed81f2a353708 (diff)
Updated to fedora-glibc-20061002T1858cvs/fedora-glibc-2_5-2cvs/fedora-2_5-base
Diffstat (limited to 'fedora')
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 67c94d1537..5c112f2090 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-09-29 20:37 UTC
-fedora-sync-tag := fedora-glibc-20060929T2037
+fedora-sync-date := 2006-10-02 18:58 UTC
+fedora-sync-tag := fedora-glibc-20061002T1858
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index b7ef376ca2..37cda6065d 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 1
+%define glibcrelease 2
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon
%ifarch %{xenarches}
@@ -1528,6 +1528,10 @@ rm -f *.filelist*
%endif
%changelog
+* Mon Oct 2 2006 Jakub Jelinek <jakub@redhat.com> 2.5-2
+- fix nscd database growing (#207928)
+- bypass prelinking when LD_DYNAMIC_WEAK=1 is in the environment
+
* Fri Sep 29 2006 Jakub Jelinek <jakub@redhat.com> 2.5-1
- glibc 2.5 release