From: Jan Palus <atler@pld-linux.org>
Date: Tue, 17 Aug 2021 12:21:18 +0000 (+0200)
Subject: builder: when using rpmspec don't remove runtime conflicts but buildtime conflicts
X-Git-Tag: auto/th/rpm-build-tools-4.10-2~3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=5d9caf4afca60f0e5cfba6f0ea04059cef703f63;p=packages%2Frpm-build-tools.git

builder: when using rpmspec don't remove runtime conflicts but buildtime conflicts
---

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