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.in9
2 files changed, 10 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 22d6a26f35..2896206bcb 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-11-10 20:49 UTC
-fedora-sync-tag := fedora-glibc-20061110T2049
+fedora-sync-date := 2006-11-20 10:00 UTC
+fedora-sync-tag := fedora-glibc-20061120T1000
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 0b99a9e00e..bd8a7c3120 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 6
+%define glibcrelease 7
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon
%ifarch %{xenarches}
@@ -1529,6 +1529,13 @@ rm -f *.filelist*
%endif
%changelog
+* Mon Nov 20 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-7
+- handle IPv6 addresses in /etc/hosts that are mappable to
+ IPv4 addresses in IPv4 host lookups (#215283)
+- fix :include: /etc/alias handling (#215572)
+- handle new tzdata format to cope with year > 2037 transitions
+ on 64-bit architectures
+
* Fri Nov 10 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-6
- fix strxfrm fix
- fix i?86 floor and ceil inlines (BZ#3451)