[glibc] - Resync with master - Drop local patch for 657588 that is no longer needed. - Drop lotch patc

[Jeffrey Law]

commit d5297ae5f7d9835d222a6cc9e32896ab64e64511
Author: Jeff Law <law at redhat.com>
Date:   Mon Dec 3 11:25:56 2012 -0700

      - Resync with master
      - Drop local patch for 657588 that is no longer needed.
      - Drop lotch patch for nss-files-overflow that seems
        useless.
      - Repack patchlist.

 .gitignore                                |    2 ++
 glibc-fedora-nss-files-overflow-fix.patch |   25 -------------------------
 glibc-rh657588.patch                      |   20 --------------------
 glibc.spec                                |   22 +++++++++++-----------
 sources                                   |    4 ++--
 5 files changed, 15 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 122c322..55f172c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,3 +77,5 @@ glibc-2.14-394-g8f3b1ff
 /glibc-2.16.90-2af1b328.tar.gz
 /glibc-2.16.90-1a538b9f-fedora.tar.gz
 /glibc-2.16.90-1a538b9f.tar.gz
+/glibc-2.16.90-70e5aee4-fedora.tar.gz
+/glibc-2.16.90-70e5aee4.tar.gz
diff --git a/glibc.spec b/glibc.spec
index c1a4e8d..1e0517d 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.16.90-1a538b9f
+%define glibcsrcdir glibc-2.16.90-70e5aee4
 %define glibcversion 2.16.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -27,7 +27,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 35%{?dist}
+Release: 36%{?dist}
 # 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
@@ -64,8 +64,7 @@ Source1: %{glibcsrcdir}-fedora.tar.gz
 Patch0001: %{name}-fedora-nscd.patch
 
 Patch0002: %{name}-fedora-regcomp-sw11561.patch
-
-Patch0003: %{name}-fedora-nss-files-overflow-fix.patch
+Patch0003: %{name}-fedora-ldd.patch
 
 Patch0004: %{name}-fedora-ppc-unwind.patch
 
@@ -83,9 +82,7 @@ Patch0007: %{name}-rh697421.patch
 
 # Needs to be sent upstream
 Patch0008: %{name}-rh740682.patch
-
-# Needs to be sent upstream
-Patch0009: %{name}-rh657588.patch
+Patch0009: %{name}-fedora-include-bits-ldbl.patch
 
 # stap, needs to be sent upstream
 Patch0010: %{name}-stap-libm.patch
@@ -118,8 +115,6 @@ Patch0038: %{name}-fedora-localedef.patch
 Patch0039: %{name}-fedora-getrlimit-PLT.patch
 Patch0040: %{name}-fedora-i386-tls-direct-seg-refs.patch
 Patch0041: %{name}-fedora-pt_chown.patch
-Patch0042: %{name}-fedora-include-bits-ldbl.patch
-Patch0043: %{name}-fedora-ldd.patch
 
 #
 # Patches from upstream
@@ -418,8 +413,6 @@ package or when debugging this package.
 %patch0039 -p1
 %patch0040 -p1
 %patch0041 -p1
-%patch0042 -p1
-%patch0043 -p1
 
 # On powerpc32, hp timing is only available in power4/power6
 # libs, not in base, so pre-power4 dynamic linker is incompatible
@@ -1214,6 +1207,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Dec 3 2012 Jeff Law <law at redhat.com> - 2.16.90-36
+  - Resync with master
+  - Drop local patch for 657588 that is no longer needed.
+  - Drop lotch patch for nss-files-overflow that seems
+    useless.
+  - Repack patchlist.
+
 * Fri Nov 30 2012 Jeff Law <law at redhat.com> - 2.16.90-35
   - Resync with master (#882137).
   - Remove local patch for strict-aliasing warnings that
diff --git a/sources b/sources
index d3d2a21..023f103 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f55e091ccdae9a29dd183116091ed679  glibc-2.16.90-1a538b9f-fedora.tar.gz
-37289795583e3897226edf1ad24c261a  glibc-2.16.90-1a538b9f.tar.gz
+9c01e48bb4243efe6eccd816e7778397  glibc-2.16.90-70e5aee4-fedora.tar.gz
+b916c52cb084837eabb4107e7fb830ca  glibc-2.16.90-70e5aee4.tar.gz