builder: when using rpmspec don't remove runtime conflicts but buildtime conflicts
authorJan Palus <atler@pld-linux.org>
Tue, 17 Aug 2021 12:21:18 +0000 (14:21 +0200)
committerJan Palus <atler@pld-linux.org>
Tue, 17 Aug 2021 12:21:18 +0000 (14:21 +0200)
builder.sh

index 453625d7f15c6bfbfbecbb88308dc0c11d2d97ef..71718af23119c68f2e9df9df8c72f7ae4c09f189 100755 (executable)
@@ -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
This page took 0.160349 seconds and 4 git commands to generate.