- install only required packages + try to remove obsoleted one

Changed files:
    builder.sh -> 1.266

diff --git a/builder.sh b/builder.sh
index e8d0994e6cd12d1e03dfa1d07ffd2e03c97a4f90..d8e03b7d2f1dc6aa6661d1ec57fabd8973226a1b 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -1021,10 +1021,17 @@ fetch_build_requires()
 {
        if [ "${FETCH_BUILD_REQUIRES}" = "yes" ]; then
                if [ "$FETCH_BUILD_REQUIRES_RPMGETDEPS" = "yes" ]; then
-                        DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk ' { print $3 } ' | xargs)
+                        CONF=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^-/ { print $3 } ' | xargs)
+                        DEPS=$(rpm-getdeps $BCOND $SPECFILE 2> /dev/null | awk '/^+/ { print $3 } ' | xargs)
+                        if [ -n "$CONF" -o -n "$DEPS" ]; then
+                                 /usr/bin/poldek --update; /usr/bin/poldek --upa
+                        fi
+                        if [ -n "$CONF" ]; then
+                                 echo "Trying to uninstall conflicting packages ($CONF):"
+                                 /usr/bin/poldek --noask --nofollow -ev $CONF
+                        fi
                         if [ -n "$DEPS" ]; then
                                  echo "Trying to install dependencies ($DEPS):"
-                                 /usr/bin/poldek --update; /usr/bin/poldek --upa
                                  /usr/bin/poldek -uGv $DEPS
                         fi
                         return