summary refs log tree commit diff
path: root/fedora
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2009-08-28 10:35:07 +0200
committerAndreas Schwab <schwab@redhat.com>2009-08-28 10:36:57 +0200
commit62f946ade44beeabffb8e91c989ff2bd47293e4c (patch)
treee7087b54635cb882ad3194861089205a898f00e9 /fedora
parent02766bf000b1f50abf2c252e0a8bd74a888770cf (diff)
parent26e1d33af0eaa41e1c968f46a891de5086c1d6d3 (diff)
downloadglibc-62f946ade44beeabffb8e91c989ff2bd47293e4c.tar.gz
glibc-62f946ade44beeabffb8e91c989ff2bd47293e4c.tar.xz
glibc-62f946ade44beeabffb8e91c989ff2bd47293e4c.zip
Merge branch 'fedora/master' of sourceware.org:/git/glibc into fedora/master
Conflicts:
	fedora/glibc.spec.in
Diffstat (limited to 'fedora')
-rw-r--r--fedora/glibc.spec.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 4eeb08f66f..eeb45f474c 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -21,7 +21,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 16
+Release: 17
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -348,6 +348,7 @@ build_CFLAGS="$BuildFlags -g -O3 $*"
 	--enable-multi-arch \
 %endif
 	--disable-profile --enable-experimental-malloc --enable-nss-crypt
+
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -1025,6 +1026,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Aug 27 2009 Roland McGrath <roland@redhat.com> - 2.10.90-17
+- Update from master.
+
 * Wed Aug 26 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-16
 - Update from master.
   - handle AVX saving on x86-64 in interrupted symbol lookups (#519081).