rpms/kdebase-workspace/devel kdebase-workspace-4.2.90-MALLOC_CHECK.patch, NONE, 1.1 kdebase-workspace.spec, 1.236, 1.237

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25057

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.90-MALLOC_CHECK.patch 
Log Message:
* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-3
- startkde: make MALLOC_CHECK opt-in (default off)


kdebase-workspace-4.2.90-MALLOC_CHECK.patch:

--- NEW FILE kdebase-workspace-4.2.90-MALLOC_CHECK.patch ---
diff -up kdebase-workspace-4.2.90/startkde.cmake.MALLOC_CHECK kdebase-workspace-4.2.90/startkde.cmake
--- kdebase-workspace-4.2.90/startkde.cmake.MALLOC_CHECK	2009-06-03 06:54:21.000000000 -0500
+++ kdebase-workspace-4.2.90/startkde.cmake	2009-06-18 21:50:57.428230467 -0500
@@ -37,8 +37,8 @@ fi
 unset DYLD_FORCE_FLAT_NAMESPACE
 
 # Enable lightweight memory corruption checker -- this is for trunk only, we remove it for releases
-MALLOC_CHECK_=2 
-export MALLOC_CHECK_
+#MALLOC_CHECK_=2 
+#export MALLOC_CHECK_
 
 # in case we have been started with full pathname spec without being in PATH
 bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- kdebase-workspace.spec	12 Jun 2009 16:57:06 -0000	1.236
+++ kdebase-workspace.spec	19 Jun 2009 02:52:31 -0000	1.237
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.90
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -15,6 +15,7 @@ Patch1: kdebase-workspace-4.2.85-redhat-
 Patch2: kdebase-workspace-4.2.85-plasma-konsole.patch
 Patch3: kdebase-workspace-4.2.90-show_systemsettings.patch
 Patch4: kdebase-workspace-4.2.85-ck-shutdown.patch
+Patch5: kdebase-workspace-4.2.90-MALLOC_CHECK.patch
 Patch6: kdebase-workspace-4.0.3-timedate-kcm.patch
 #Â 441062: packagekit tools do not show icons correctly on KDE
 Patch7: kdebase-workspace-4.0.3-krdb.patch
@@ -207,6 +208,7 @@ Requires: PyKDE4 >= %{version}
 %patch3 -p1 -b .show_systemsettings
 # ConsoleKit >= 0.2.4 shutdown/reboot support (needed for GDM 2.22)
 %patch4 -p1 -b .ck-shutdown
+%patch5 -p1 -b .MALLOC_CHECK
 %patch6 -p0 -b .timedate-kcm
 %patch7 -p0 -b .krdb
 %patch8 -p1 -b .klipper-url
@@ -498,6 +500,9 @@ fi
 
 
 %changelog
+* Thu Jun 18 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-3
+- startkde: make MALLOC_CHECK opt-in (default off)
+
 * Fri Jun 12 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.90-2
 - bump Obsoletes: PolicyKit-kde