[glibc] Sync with upstream master

Siddhesh Poyarekar siddhesh at fedoraproject.org
Thu Nov 28 12:44:23 UTC 2013


commit 439a9b91b6568bf639c8d66f63a44aa1f494c463
Author: Siddhesh Poyarekar <siddhesh at redhat.com>
Date:   Thu Nov 28 18:17:19 2013 +0530

    Sync with upstream master

 glibc-rh1009623.patch |  127 -------------------------------------------------
 glibc.spec            |   11 ++--
 sources               |    2 +-
 3 files changed, 6 insertions(+), 134 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 98562c8..844463b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcsrcdir  glibc-2.18-411-gf3fd262
+%define glibcsrcdir  glibc-2.18-456-g5a4c6d5
 %define glibcversion 2.18.90
-%define glibcrelease 15%{?dist}
+%define glibcrelease 16%{?dist}
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
 #
@@ -176,9 +176,6 @@ Patch0040: %{name}-rh731833-rtkaio.patch
 Patch0041: %{name}-rh731833-rtkaio-2.patch
 Patch0042: %{name}-rh970865.patch
 
-# Avoid the use of __block which is a reserved keyword for clang++.
-Patch0043: %{name}-rh1009623.patch
-
 # ARM: Accept that some objects marked hard ABI are now not because of a
 #      binutils bug.
 Patch0044: %{name}-rh1009145.patch
@@ -535,7 +532,6 @@ package or when debugging this package.
 %patch0040 -p1
 %patch0041 -p1
 %patch0042 -p1
-%patch0043 -p1
 %patch0044 -p1
 %patch0046 -p1
 %patch2028 -p1
@@ -1624,6 +1620,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Nov 28 2013 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.18.90-16
+- Sync with upstream master.
+
 * Wed Nov 20 2013 Siddhesh Poyarekar <siddhesh at redhat.com> - 2.18.90-15
 - Sync with upstream master.
 
diff --git a/sources b/sources
index 25e6950..e48d6df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7325c781208cdb3f82fd38113644ea98  glibc-2.18-411-gf3fd262.tar.gz
+1063ba7050bcebfea199388e49ec01a0  glibc-2.18-456-g5a4c6d5.tar.gz


More information about the scm-commits mailing list