openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Silvan Calarco 2021-03-16 21:35:00 +01:00
parent 695a354bd6
commit f89da44c7b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/pck-update.in
View File

@ -2167,18 +2167,20 @@ $SRPM_SPECFILE_WITH_PATH $USER_RPMDEFINE_OPTS 2>&1"
notify.note "${NOTE}"$"building the srpm package""${NORM}..." notify.note "${NOTE}"$"building the srpm package""${NORM}..."
# as the dependencies check is done before, it is safe to pass # as the dependencies check is done before, it is safe to pass
# --nodeps to non-simulated build commands. # --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 "\ eval "\
rpmbuild -bs $USER_RPMDEFINE_OPTS $rpmbuild_opts --nodeps \ rpmbuild -bs $USER_RPMDEFINE_OPTS $rpmbuild_opts \
$SRPM_SPECFILE_WITH_PATH 2>&1" $SRPM_SPECFILE_WITH_PATH 2>&1"
elif [ "$nosrpm" = 1 ]; then elif [ "$nosrpm" = 1 ]; then
notify.note "${NOTE}"$"building the rpm packages""${NORM}..." notify.note "${NOTE}"$"building the rpm packages""${NORM}..."
eval "\ eval "\
rpmbuild -bb $USER_RPMDEFINE_OPTS $rpmbuild_opts --nodeps \ rpmbuild -bb $USER_RPMDEFINE_OPTS $rpmbuild_opts \
$SRPM_SPECFILE_WITH_PATH 2>&1" $SRPM_SPECFILE_WITH_PATH 2>&1"
else else
notify.note "${NOTE}"$"building rpm and srpm packages""${NORM}..." notify.note "${NOTE}"$"building rpm and srpm packages""${NORM}..."
eval "\ eval "\
rpmbuild -ba $USER_RPMDEFINE_OPTS $rpmbuild_opts --nodeps \ rpmbuild -ba $USER_RPMDEFINE_OPTS $rpmbuild_opts \
$SRPM_SPECFILE_WITH_PATH 2>&1" $SRPM_SPECFILE_WITH_PATH 2>&1"
fi fi
local rpmbuild_retcode="$?" local rpmbuild_retcode="$?"