[kdebase-workspace] - startkde: drop MALLOC_CHECK bits

[Rex Dieter]

commit c22e8b2583f7e0f47048f89b0b2919071cd6088d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 26 08:51:05 2011 -0600

    - startkde: drop MALLOC_CHECK bits

 ...-workspace-4.6.0-startkde_no_malloc_check.patch |   22 ++++++++++++++++++++
 kdebase-workspace.spec                             |    7 +++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.6.0-startkde_no_malloc_check.patch b/kdebase-workspace-4.6.0-startkde_no_malloc_check.patch
new file mode 100644
index 0000000..99ba239
--- /dev/null
+++ b/kdebase-workspace-4.6.0-startkde_no_malloc_check.patch
@@ -0,0 +1,22 @@
+diff -up kdebase-workspace-4.6.0/startkde.cmake.no_malloc_check kdebase-workspace-4.6.0/startkde.cmake
+--- kdebase-workspace-4.6.0/startkde.cmake.no_malloc_check	2011-01-26 08:47:30.306263256 -0600
++++ kdebase-workspace-4.6.0/startkde.cmake	2011-01-26 08:49:00.342055798 -0600
+@@ -44,18 +44,6 @@ fi
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# Enable lightweight memory corruption checker if not already set
+-# -- this is for trunk only, we remove it for releases
+-if [ "x$MALLOC_CHECK_" = "x" ] && [ -x /lib/libc.so.6 ]; then
+-    # Extract the first two components of the version from the output.
+-    glibc_version=$(LC_ALL=C /lib/libc.so.6 | sed -e 's/[^0-9]*\([0-9]\.[0-9]\+\).*/\1/;s/\.\([0-9]\)$/.0\1/;q')
+-
+-    MALLOC_CHECK_=2 # Default to 2 unless glibc 2.9 or higher.
+-    test $glibc_version \> 2.08 && MALLOC_CHECK_=3
+-
+-    export MALLOC_CHECK_
+-fi
+-
+ # in case we have been started with full pathname spec without being in PATH
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index c282c93..08fed84 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.0
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version 4.6.00
 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -66,6 +66,7 @@ Patch23: kdebase-workspace-4.5.2-startkde_zenity.patch
 Patch50: kdebase-workspace-4.3.3-kde#171685.patch
 
 ## 4.6 patches
+Patch100: kdebase-workspace-4.6.0-startkde_no_malloc_check.patch
 
 ## Fedora specific patches
 # HALsectomy
@@ -298,6 +299,7 @@ Requires: akonadi
 %patch50 -p1 -b .kde#171685
 
 # 4.6 patches
+%patch100 -p1 -b .startkde_no_malloc_check
 
 # trunk patches
 
@@ -696,6 +698,9 @@ fi
 
 
 %changelog
+* Wed Jan 26 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.0-4
+- startkde: drop MALLOC_CHECK bits
+
 * Tue Jan 25 2011 Lukas Tinkl <ltinkl at redhat.com> - 4.6.0-3
 - respun tarball, omit (now upstreamed) PowerDevil 
   fixes from 4.6.0-2