From 985f2b15128d24f099d68ee47ed574ad7377df9e Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 21 Jan 2004 16:08:37 +0000 Subject: [PATCH] implemented %%_keep_libtool_files support --- platform.in | 1 + rpm-4_0.spec | 1 + scripts/brp-cleanup.in | 12 +++++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/platform.in b/platform.in index 1069874..bc8557f 100644 --- a/platform.in +++ b/platform.in @@ -227,6 +227,7 @@ @alt@ %{?_pkg_contents_index_all:export RPM_PKG_CONTENTS_INDEX_ALL=\"%_pkg_contents_index_all\"}\ @alt@ %{?_pkg_contents_index_bin:export RPM_PKG_CONTENTS_INDEX_BIN=\"%_pkg_contents_index_bin\"}\ @alt@ %{?_scripts_debug:export RPM_SCRIPTS_DEBUG=\"%_scripts_debug\"}\ +@alt@ %{?_keep_libtool_files:export RPM_KEEP_LIBTOOL_FILES=\"%_keep_libtool_files\"}\ @alt@ %{?__python:export RPM_PYTHON=\"%__python\"}\ @alt@ \ @alt@ unset LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL ||:\ diff --git a/rpm-4_0.spec b/rpm-4_0.spec index 82fe631..1434329 100644 --- a/rpm-4_0.spec +++ b/rpm-4_0.spec @@ -506,6 +506,7 @@ fi %changelog * Sun Jan 04 2004 Dmitry V. Levin 4.0.4-alt29 - brp-cleanup: fixed possible cleanup misses. +- brp-cleanup, platform: implemented %%_keep_libtool_files support. - verify-elf: verify SUID/SGID ELF objects as well. - fixup-libraries: fix SUID/SGID libraries as well. - find-lang: implemented --with-kde option (aris@, #2666). diff --git a/scripts/brp-cleanup.in b/scripts/brp-cleanup.in index d7c1055..710411d 100755 --- a/scripts/brp-cleanup.in +++ b/scripts/brp-cleanup.in @@ -63,11 +63,13 @@ find .$RPM_CLEANUP_TOPDIR -type f \( \ find .$RPM_CLEANUP_TOPDIR -type d -name CVS -print0 | xargs -r0 rm -vrf -- -for d in ./lib ./usr/lib ./usr/X11R6/lib; do - [ -d "$d" ] || continue - find "$d" -type f -mindepth 1 -maxdepth 1 -name 'lib*.la' -print0 | - xargs -r0 rm -fv -- -done +if [ -z "$RPM_KEEP_LIBTOOL_FILES" ]; then + for d in ./lib ./usr/lib ./usr/X11R6/lib; do + [ -d "$d" ] || continue + find "$d" -type f -mindepth 1 -maxdepth 1 -name 'lib*.la' -print0 | + xargs -r0 rm -fv -- + done +fi if [ -d ./etc/pam.d ]; then find ./etc/pam.d -type f -mindepth 1 -maxdepth 1 -print0 |