summaryrefslogtreecommitdiff
path: root/fedora
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-12-21 09:35:28 +0000
committerJakub Jelinek <jakub@redhat.com>2005-12-21 09:35:28 +0000
commitbaa0a2c9a410a88fcacdf82abc7d21b0c99c7cd3 (patch)
tree23761bbdd386ee804a16e3483d30adb8bc204c3a /fedora
parent2bf037b4e8e189e910a41744d79404b94235ab8b (diff)
Updated to fedora-glibc-20051221T0931
Diffstat (limited to 'fedora')
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in7
2 files changed, 8 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index e40e93094d..43a878b1bd 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 := 2005-12-20 17:51 UTC
-fedora-sync-tag := fedora-glibc-20051220T1751
+fedora-sync-date := 2005-12-21 09:31 UTC
+fedora-sync-tag := fedora-glibc-20051221T0931
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index ea7640684d..d28e5481ab 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 21
+%define glibcrelease 22
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define prelinkarches noarch
%define xenarches i686 athlon
@@ -1074,6 +1074,11 @@ rm -f *.filelist*
%endif
%changelog
+* Wed Dec 21 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-22
+- update from CVS
+ - minor fts fixes
+- revert broken _Pragma () workaround
+
* Tue Dec 20 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-21
- update from CVS
- fix pointer (de)mangling in gconv_cache.c