From 3cf1116db1d7dd07527ad1737bc9cd19fde7bcc2b549a2dd8f6f955b55e95f2a Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 14 Feb 2011 13:26:31 +0000 Subject: [PATCH] - make malloc checking configurable OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=215 --- aaa_base.changes | 3 ++- aaa_base.spec | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/aaa_base.changes b/aaa_base.changes index 92ca9da..20478e7 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Mon Feb 14 13:12:11 UTC 2011 - lnussel@suse.de +Mon Feb 14 13:23:35 UTC 2011 - lnussel@suse.de - don't time out waiting for tmpfs (bnc#671468) +- make malloc checking configurable ------------------------------------------------------------------- Fri Feb 11 18:39:04 CET 2011 - werner@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index f7cb387..a0454b1 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -17,6 +17,7 @@ # norootforbuild +%bcond_with aaa_base_malloc_debug Name: aaa_base Version: 11.4 @@ -75,7 +76,9 @@ install -d -m 700 root test -d ../aaa_base/root/.gnupg && exit 1 cp -a ../aaa_base/* $RPM_BUILD_ROOT # for the release -#rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.* +%if !%{with aaa_base_malloc_debug} +rm $RPM_BUILD_ROOT/etc/profile.d/malloc-debug.* +%endif cp $RPM_SOURCE_DIR/get_kernel_version $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates for i in $RPM_BUILD_DIR/sysconfig_parts/sysconfig.* ; do @@ -137,8 +140,10 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %config /etc/profile.d/csh.utf8 %config /etc/profile.d/lang.csh %config /etc/profile.d/lang.sh +%if %{with aaa_base_malloc_debug} %config /etc/profile.d/malloc-debug.sh %config /etc/profile.d/malloc-debug.csh +%endif %config /etc/profile.d/profile.csh %config /etc/profile.d/profile.sh %config /etc/profile.d/sh.ssh