From d61fdfcf3b03d38f9b8b2cd53678d58f95226878 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 8 Sep 2014 14:37:31 +0530
Subject: [PATCH] Rebase to upstream release 2.20

No rebases from master on this branch from now on.
---
 glibc.spec | 17 +++++++----------
 sources    |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index 74b022c..e0f3849 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.19-886-gdd763fd
-%define glibcversion 2.19.90
-%define glibcrelease 36%{?dist}
+%define glibcsrcdir  glibc-2.20
+%define glibcversion 2.20
+%define glibcrelease 1%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -9,7 +9,7 @@
 # gzip -9 $(git describe --match 'glibc-*').tar
 #
 # glibc_release_url is only defined when we have a release tarball.
-# % define glibc_release_url http://ftp.gnu.org/gnu/glibc/
+%define glibc_release_url http://ftp.gnu.org/gnu/glibc/
 ##############################################################################
 # If run_glibc_tests is zero then tests are not run for the build.
 # You must always set run_glibc_tests to one for production builds.
@@ -185,10 +185,6 @@ Patch0046: %{name}-rh1013801.patch
 
 Patch0047: %{name}-nscd-sysconfig.patch
 
-Patch0048: %{name}-rh1133134-i386-tlsinit.patch
-
-Patch0049: %{name}-rh1119128.patch
-
 # Allow up to 32 libraries to use static TLS. Should go upstream after
 # more testing.
 Patch0050: %{name}-rh1124987.patch
@@ -563,8 +559,6 @@ package or when debugging this package.
 %patch2033 -p1
 %patch2034 -p1
 %patch2035 -p1
-%patch0048 -p1
-%patch0049 -p1
 %patch0050 -p1
 
 ##############################################################################
@@ -1673,6 +1667,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Sep  8 2014 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.20-1
+- Rebase to upstream release 2.20.
+
 * Thu Sep  4 2014 Carlos O'Donell <carlos@redhat.com> - 2.19.90-36
 - Allow up to 32 dlopened modules to use static TLS (#1124987).
 - Run glibc tests in %%check section of RPM spec file.
diff --git a/sources b/sources
index f0a7ec7..a33221e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b7d687c4bf371fc6fd5b100b9ded870  glibc-2.19-886-gdd763fd.tar.gz
+aabb1776353e6bc60ecc707af78a3813  glibc-2.20.tar.gz