From 6816b44c4c14cc537c65b6888692e42fa55a37fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 29 Jan 2008 21:09:13 +0000 Subject: [PATCH] - another hack for rpm 4.4.9 to skip %clean and be 4.4.2 compatible Changed files: repackage.sh -> 1.21 --- repackage.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/repackage.sh b/repackage.sh index 65cc1d0..638c9e5 100644 --- a/repackage.sh +++ b/repackage.sh @@ -21,18 +21,22 @@ set -e rpmbuild() { # use gz payload as time is what we need here, not compress ratio + + # we use %__ldconfig variable to test are we on rpm 4.4.9 + # on 4.4.9 we should not redefine %clean to contain %clean, and redefine %__spec_clean_body instead + # on 4.4.2 we must redefine %clean to contain %clean set -x /usr/bin/rpmbuild \ ${TARGET:+--target $TARGET} \ $BCONDS \ --short-circuit \ - --define '_source_payload w9.gzdio' \ - --define '__spec_install_pre %___build_pre' \ - --define '__spec_clean_body %{nil}' \ - --define 'clean %%clean \ + --define 'clean %%%{!?__ldconfig:clean}%{?__ldconfig:check} \ exit 0%{nil}' \ --define 'check %%check \ exit 0%{nil}' \ + --define '_source_payload w9.gzdio' \ + --define '__spec_install_pre %___build_pre' \ + --define '__spec_clean_body %{nil}' \ "$@" || exit } -- 2.44.0