- rel 6; updates from git (fixes: BZ #20111, CVE-2016-4429)

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index cde8e05e1ada0288b07c403d026998600440efc0..9c468c8d05da77ac0314c51c782a01f7d29364c3 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -41,7 +41,7 @@ Summary(tr.UTF-8):    GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       1
+Release:       6
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -52,12 +52,13 @@ Source3:    nscd.sysconfig
 Source4:       nscd.logrotate
 # from man-pages.spec --with tars
 Source5:       %{name}-man-pages.tar.xz
-# Source5-md5: 3a4eabb7d28db7d35d8204fdb471a863
+# Source5-md5: 82537aa7f6ee31dd782e7e085cc21018
 Source6:       %{name}-localedb-gen
 Source7:       %{name}-LD-path.c
 Source9:       nscd.tmpfiles
 # git diff glibc-2.23..release/2.23/master
 Patch0:                glibc-git.patch
+# Patch0-md5:  13fd232a8c5c26d378e56f72172b26dd
 # against GNU TP (libc domain)
 #Patch1:               %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -498,6 +499,12 @@ Provides:  %{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 Provides:      %{name}-devel(ix86) = %{epoch}:%{version}-%{release}
 %endif
 Obsoletes:     libiconv-devel
+%ifarch %{x8664}
+# see http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2016-May/024902.html
+%if "%(rpm -q --qf '%{E}:%{V}' binutils)" >= "4:2.26"
+Conflicts: binutils < 4:2.26
+%endif
+%endif
 
 %description devel
 To develop programs which use the standard C libraries (which nearly