pck-update: remove --nodeps to build commands to fix build requirements being skipped. Not sure why it worked before and maybe this broke since rpm 4.16
This commit is contained in:
parent
695a354bd6
commit
f89da44c7b
@ -2167,18 +2167,20 @@ $SRPM_SPECFILE_WITH_PATH $USER_RPMDEFINE_OPTS 2>&1"
|
||||
notify.note "${NOTE}"$"building the srpm package""${NORM}..."
|
||||
# as the dependencies check is done before, it is safe to pass
|
||||
# --nodeps to non-simulated build commands.
|
||||
# NOTE: it seems that since rpm 4.16 above is not true thus
|
||||
# --nodeps has been removed from build commands
|
||||
eval "\
|
||||
rpmbuild -bs $USER_RPMDEFINE_OPTS $rpmbuild_opts --nodeps \
|
||||
rpmbuild -bs $USER_RPMDEFINE_OPTS $rpmbuild_opts \
|
||||
$SRPM_SPECFILE_WITH_PATH 2>&1"
|
||||
elif [ "$nosrpm" = 1 ]; then
|
||||
notify.note "${NOTE}"$"building the rpm packages""${NORM}..."
|
||||
eval "\
|
||||
rpmbuild -bb $USER_RPMDEFINE_OPTS $rpmbuild_opts --nodeps \
|
||||
rpmbuild -bb $USER_RPMDEFINE_OPTS $rpmbuild_opts \
|
||||
$SRPM_SPECFILE_WITH_PATH 2>&1"
|
||||
else
|
||||
notify.note "${NOTE}"$"building rpm and srpm packages""${NORM}..."
|
||||
eval "\
|
||||
rpmbuild -ba $USER_RPMDEFINE_OPTS $rpmbuild_opts --nodeps \
|
||||
rpmbuild -ba $USER_RPMDEFINE_OPTS $rpmbuild_opts \
|
||||
$SRPM_SPECFILE_WITH_PATH 2>&1"
|
||||
fi
|
||||
local rpmbuild_retcode="$?"
|
||||
|
Loading…
Reference in New Issue
Block a user