Accepting request 99612 from home:a_jaeger:my-factory-packages

Fix for bnc#740109

OBS-URL: https://build.opensuse.org/request/show/99612
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=152

glibc.spec

@@ -194,6 +194,8 @@ Patch88:        pthread-cond-wait-revert.patch
 Patch89:        glibc-2.16-scanf.patch
 # PATCH-FIX-UPSTREAM Fix getcontext on 32-bit powerpc - aj@suse.de
 Patch90:        glibc-ppc-getcontext.patch
+# PATCH-FIX-OPENSUSE Revert some math ifuncs (bnc#740109) - aj@suse.de
+Patch91:        glibc-2.15-math64crash.patch
 
 %description
 The GNU C Library provides the most important standard libraries used
@@ -260,6 +262,7 @@ License:        LGPL-2.1+
 Group:          System/Daemons
 Provides:       aaa_base:/etc/init.d/nscd
 Provides:       glibc:/usr/sbin/nscd
+Requires:       glibc = %{version}
 Requires(preun): %insserv_prereq
 Requires(post): %insserv_prereq
 Requires(postun): %insserv_prereq
@@ -411,6 +414,7 @@ rm nscd/s-stamp
 %patch88 -p1 -R
 %patch89 -p1
 %patch90 -p1
+%patch91 -p1
 
 #
 # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed!
@@ -510,6 +514,9 @@ PARALLEL="%{?_smp_mflags}"
 	# fails to build otherwise - need to recheck and fix
 	%define enable_stackguard_randomization 0
 %endif
+# Remove completely, these give some strange crashes with dlopen
+# See bnc#740109
+rm -rf sysdeps/x86_64/fpu/multiarch
 
 configure_and_build_glibc() {
 	local dirname="$1"; shift