From 5d9caf4afca60f0e5cfba6f0ea04059cef703f63 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 17 Aug 2021 14:21:18 +0200 Subject: [PATCH] builder: when using rpmspec don't remove runtime conflicts but buildtime conflicts --- builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder.sh b/builder.sh index 453625d..71718af 100755 --- a/builder.sh +++ b/builder.sh @@ -2040,7 +2040,7 @@ install_build_requires_rpmdeps() { DEPS=$(eval rpm-getdeps $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '/^\+/ { print $3 } ' | _rpm_prov_check | xargs) fi if [ "$FETCH_BUILD_REQUIRES_RPMSPEC_BINARY" = "yes" ]; then - CNFL=$(eval rpmspec --query --conflicts $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '{print $1}' | _rpm_cnfl_check | xargs); + CNFL=$(eval rpmspec --query --buildconflicts $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '{print $1}' | _rpm_cnfl_check | xargs); DEPS=$(eval rpmspec --query --buildrequires $BCOND $RPMOPTS $SPECFILE 2> /dev/null | awk '{print $1}' | _rpm_prov_check | xargs); fi if [ "$FETCH_BUILD_REQUIRES_RPMSPECSRPM" = "yes" ]; then -- 2.43.0