Updated to fedora-glibc-20071017T2029 cvs/fedora-glibc-2_7-1

6 files changed, 18 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c3121c7ec..714c014f88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-10-17  Ulrich Drepper  <drepper@redhat.com>
 
+	* version.h (VERSION): Bump to 2.7.
+	* include/features.h (__GLIBC_MINOR__): Bump to 7.
+
+	[BZ #5186]
+	* time/tzset.c (__tz_convert): Don't force testing for a change of
+	TZ if not called from localtime.  But then also see whether the
+	file changed, in case __use_tzfile is set.
+
 	* sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Define F_DUPFD_CLOEXEC.
 	* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise.
 	* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise.
diff --git a/README b/README
index 7b82d80e97..a6374ca430 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory contains the version 2.6 release of the GNU C Library.
+This directory contains the version 2.7 release of the GNU C Library.
 
 The GNU C Library is the standard system C library for all GNU systems,
 and is an important part of what makes up a GNU system.  It provides the
@@ -52,7 +52,7 @@ The GNU C Library supports these configurations for using Linux kernels:
 
 The code for other CPU configurations supported by volunteers outside of
 the core glibc maintenance effort is contained in the separate `ports'
-add-on.  You can find glibc-ports-2.6 distributed separately in the
+add-on.  You can find glibc-ports-2.7 distributed separately in the
 same place where you got the main glibc distribution files.
 Currently these configurations are known to work using the `ports' add-on:
 
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 25da2e3c2b..482fb092d4 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-f8
-fedora-sync-date := 2007-10-17 20:07 UTC
-fedora-sync-tag := fedora-glibc-20071017T2007
+fedora-sync-date := 2007-10-17 20:29 UTC
+fedora-sync-tag := fedora-glibc-20071017T2029
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 19c39c2245..0b8e7b43af 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 22
+%define glibcrelease 1
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
@@ -1010,7 +1010,8 @@ rm -f *.filelist*
 %endif
 
 %changelog
-* Wed Oct 17 2007 Jakub Jelinek <jakub@redhat.com> 2.6.90-22
+* Wed Oct 17 2007 Jakub Jelinek <jakub@redhat.com> 2.7-1
+- glibc 2.7 release
 - fix tzfile.c for times after last transition (#333561)
 - fix sem_post@GLIBC_2.0 on i?86
 - appease valgrind in libpthread.so initialization
diff --git a/include/features.h b/include/features.h
index 3ab68b67cd..6191d2044c 100644
--- a/include/features.h
+++ b/include/features.h
@@ -316,7 +316,7 @@
 /* Major and minor version number of the GNU C library package.  Use
    these macros to test for features in specific releases.  */
 #define	__GLIBC__	2
-#define	__GLIBC_MINOR__	6
+#define	__GLIBC_MINOR__	7
 
 #define __GLIBC_PREREQ(maj, min) \
 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
diff --git a/version.h b/version.h
index 2fc4a7b8d3..5fa63ac5eb 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
-#define RELEASE "development"
-#define VERSION "2.6.90"
+#define RELEASE "stable"
+#define VERSION "2.7"