diff --git a/scripts/brp-cleanup b/scripts/brp-cleanup index c1bded0..419c1c0 100755 --- a/scripts/brp-cleanup +++ b/scripts/brp-cleanup @@ -21,6 +21,8 @@ PROG="${0##*/}" +RPM_CLEANUP_METHOD="${RPM_CLEANUP_METHOD## }" +RPM_CLEANUP_METHOD="${RPM_CLEANUP_METHOD%% }" echo "Cleaning files in $RPM_BUILD_ROOT ($RPM_CLEANUP_METHOD)" if [ "$RPM_CLEANUP_METHOD" = skip ]; then diff --git a/scripts/brp-compress.in b/scripts/brp-compress.in index 363d31f..1046682 100755 --- a/scripts/brp-compress.in +++ b/scripts/brp-compress.in @@ -20,6 +20,8 @@ PROG="${0##*/}" +RPM_COMPRESS_METHOD="${RPM_COMPRESS_METHOD## }" +RPM_COMPRESS_METHOD="${RPM_COMPRESS_METHOD%% }" echo "Compressing files in $RPM_BUILD_ROOT ($RPM_COMPRESS_METHOD)" if [ "$RPM_COMPRESS_METHOD" = skip ]; then diff --git a/scripts/brp-strip.in b/scripts/brp-strip.in index 34ddfe7..39bf446 100755 --- a/scripts/brp-strip.in +++ b/scripts/brp-strip.in @@ -176,8 +176,8 @@ export STRIP_EXECUTABLE= export STRIP_RELOCATABLE= export STRIP_SHARED= export STRIP_STATIC= -for t in $RPM_STRIP_METHOD; do - case "${t/%,}" in +for t in `echo "$RPM_STRIP_METHOD" |tr , ' '`; do + case "$t" in no|none|off|false) exit 0 ;; diff --git a/scripts/compress_files.in b/scripts/compress_files.in index e6eeb79..ee3a364 100755 --- a/scripts/compress_files.in +++ b/scripts/compress_files.in @@ -20,6 +20,8 @@ PROG="${0##*/}" +RPM_COMPRESS_METHOD="${RPM_COMPRESS_METHOD## }" +RPM_COMPRESS_METHOD="${RPM_COMPRESS_METHOD%% }" case "$RPM_COMPRESS_METHOD" in no|none|plain|skip) exit 0