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

Cleanup.

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

glibc.spec

@@ -56,14 +56,6 @@ BuildRequires:  libstdc++-devel
 # 2.6.16 is the SLES 10 kernel, use this as oldest supported kernel
 # since many SUSE build machines have it
 %define enablekernel 2.6.16
-%ifarch ppc ppc64
-# On PowerPC we got a memory corruption during building, disabling
-# exp_malloc fixed it. Disable it until we have found and fixed the
-# root cause.
-%define exp_malloc 0
-%else
-%define exp_malloc 1
-%endif
 # ngpt was used in 8.1 and SLES8
 Obsoletes:      ngpt < 2.2.2
 Obsoletes:      ngpt-devel < 2.2.2
@@ -165,8 +157,6 @@ Patch46:        glibc-resolv-mdnshint.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch47:        glibc-nscd-hconf.diff
 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch48:        glibc-malloc-arena-max.diff
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch49:        glibc-fini-unwind.diff
 # PATCH-FIX-OPENSUSE bnc#657627
 Patch52:        glibc-elf-localscope.diff
@@ -400,9 +390,6 @@ rm nscd/s-stamp
 %patch45
 %patch46 -p1
 %patch47 -p1
-%if !%{exp_malloc}
-%patch48 -p1
-%endif
 %patch49
 %patch52
 %patch65 -p1
@@ -531,7 +518,7 @@ configure_and_build_glibc() {
 	CFLAGS="$conf_cflags" CC="$BuildCC" CXX="$BuildCCplus"  ../configure \
 		--prefix=%{_prefix} \
 		--libexecdir=%{_libdir} --infodir=%{_infodir} \
-		--enable-add-ons=nptl$addons --without-cvs --enable-profile \
+		--enable-add-ons=nptl$addons --enable-profile \
 		"$@" \
 %if %{enable_stackguard_randomization}
 		--enable-stackguard-randomization \
@@ -543,10 +530,7 @@ configure_and_build_glibc() {
 %ifarch mipsel
 		--without-fp \
 %endif
-%if %{exp_malloc}
-		--enable-experimental-malloc \
-%endif
-		--with-tls --with-__thread --enable-kernel=%{enablekernel} \
+		--enable-kernel=%{enablekernel} \
 		--enable-bind-now
 # Should we enable --enable-nss-crypt to build use freebl3 hash functions?
 	# explicitly set CFLAGS to use the full CFLAGS (not the reduced one for configure)