From ded8b949ca91eae8bfcc9d3337913dda620416b3 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 14 Apr 2009 21:18:57 +0000
Subject: Updated to fedora-glibc-20090414T2104

---
 fedora/branch.mk     |  4 ++--
 fedora/glibc.spec.in | 32 +++++---------------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

(limited to 'fedora')

diff --git a/fedora/branch.mk b/fedora/branch.mk
index 4c3dc344b6..3b62c91029 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 := 2009-04-09 14:22 UTC
-fedora-sync-tag := fedora-glibc-20090409T1422
+fedora-sync-date := 2009-04-14 21:04 UTC
+fedora-sync-tag := fedora-glibc-20090414T2104
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index db1124fad9..8d22e2f00e 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -19,7 +19,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: @glibcversion@
-Release: 15
+Release: 16
 # 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
@@ -229,31 +229,6 @@ package or when debugging this package.
 %endif
 %endif
 
-mkdir -p override_headers/asm
-cat > override_headers/asm/unistd.h <<EOF
-#ifndef _HACK_ASM_UNISTD_H
-#include_next <asm/unistd.h>
-%ifarch %{ix86}
-#ifndef __NR_preadv
-#define __NR_preadv	333
-#define __NR_pwritev	334
-#endif
-%endif
-%ifarch x86_64
-#ifndef __NR_preadv
-#define __NR_preadv	295
-#define __NR_pwritev	296
-#endif
-%endif
-%ifarch ppc ppc64
-#ifndef __NR_preadv
-#define __NR_preadv	320
-#define __NR_pwritev	321
-#endif
-%endif
-#endif
-EOF
-
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
 # all.
@@ -342,7 +317,7 @@ mkdir $builddir ; cd $builddir
 build_CFLAGS="$BuildFlags -g -O3 $*"
 CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \
 	--enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \
-	--with-headers=`cd ..; pwd`/override_headers:%{_prefix}/include --enable-bind-now \
+	--with-headers=%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
 	--disable-profile --enable-experimental-malloc --enable-nss-crypt
@@ -1034,6 +1009,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Apr 14 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-16
+- update from trunk
+
 * Thu Apr  9 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-15
 - rebuilt with fixed gcc to avoid miscompilation of i586 memmove
 - reenable experimental malloc again
-- 
cgit v1.2.3