[glibc] Sync with upstream master

Siddhesh Poyarekar siddhesh at fedoraproject.org
Mon Sep 8 07:02:43 UTC 2014


commit 680bff1439d4080edf1bea2375187e0e81be0832
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Mon Sep 8 12:32:01 2014 +0530

    Sync with upstream master

 glibc-rh1119128.patch              |  199 ------------------------------------
 glibc-rh1133134-i386-tlsinit.patch |   19 ----
 glibc.spec                         |   15 +--
 sources                            |    2 +-
 4 files changed, 7 insertions(+), 228 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 74b022c..d25aa22 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-3-g645a0e9
+%define glibcversion 2.20.90
+%define glibcrelease 1%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -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 08 2014 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.20.90-1
+- Sync with upstream master.
+
 * Thu Sep  4 2014 Carlos O'Donell <carlos at 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..265211a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6b7d687c4bf371fc6fd5b100b9ded870  glibc-2.19-886-gdd763fd.tar.gz
+335a04fc28b73fe52256026c4f25a9bb  glibc-2.20-3-g645a0e9.tar.gz


More information about the scm-commits mailing list