summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in5
-rw-r--r--nptl/ChangeLog8
3 files changed, 10 insertions, 7 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index f3695883a2..d8ddab0af2 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 := 2004-12-18 11:31 UTC
-fedora-sync-tag := fedora-glibc-20041218T1131
+fedora-sync-date := 2004-12-18 23:12 UTC
+fedora-sync-tag := fedora-glibc-20041218T2312
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 2130afaa10..d2963e1420 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 98
+%define glibcrelease 99
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1266,6 +1266,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sun Dec 19 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-99
+- rebuilt
+
 * Sat Dec 18 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-98
 - add .%%{_target_cpu} to glibc_post_upgrade, only run telinit u
   if /sbin/init is the same ELF class and machine as
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 19f877dcf9..de90f2a66d 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,13 +1,13 @@
-2004-12-18  Jakub Jelinek  <jakub@redhat.com>
+2004-12-18  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/bits/local_lim.h:
-	Removed.
+	New file removed withdrawn for the moment.
 
 2004-12-17  Richard Henderson  <rth@redhat.com>
 
 	* sysdeps/unix/sysv/linux/alpha/clone.S: New file.
 	* sysdeps/alpha/tcb-offsets.sym (TID_OFFSET): New.
-	
+
 2004-12-16  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/bits/local_lim.h: New file.
@@ -56,7 +56,7 @@
 	* sysdeps/pthread/posix-timer.h (__timer_signal_thread_pclk,
 	__timer_signal_thread_tclk): Remove.
 	* sysdeps/unix/sysv/linux/i386/bits/posix_opt.h: Removed.
-	* sysdeps/unix/sysv/linux/ia64/bits/posix_opt.h: Removed.
+	* sysdeps/unix/sysv/linux/ia64/bits/posix_>opt.h: Removed.
 	* sysdeps/unix/sysv/linux/x86_64/bits/posix_opt.h: Removed.
 
 2004-12-07  Jakub Jelinek  <jakub@redhat.com>