- handle new bconds correctly after rpm-find-spec-bcond recently fixes

  (with backward-bug-compability) by Mikolaj Kucharski <build kompuart pl>

Changed files:
    builder.sh -> 1.323

diff --git a/builder.sh b/builder.sh
index ca5009e6e86d2e5000ed1d51eda7ff5605e07bef..3935293542720744fcd9dd708a85840c34ab657a 100644 (file)
--- a/builder.sh
+++ b/builder.sh
@@ -1045,6 +1045,22 @@ set_bconds_values()
                                        _with)
                                                cond_type="with"
                                                ;;
+                                       _without_*)
+                                               AVAIL_BCOND_WITHOUT="`echo $opt | sed 's/^_without_//g'`"
+                                               if `echo $BCOND|grep -q -- "--without $AVAIL_BCOND_WITHOUT"`;then
+                                                       AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT <$AVAIL_BCOND_WITHOUT>"
+                                               else
+                                                       AVAIL_BCONDS_WITHOUT="$AVAIL_BCONDS_WITHOUT $AVAIL_BCOND_WITHOUT"
+                                               fi
+                                               ;;
+                                       _with_*)
+                                               AVAIL_BCOND_WITH="`echo $opt | sed 's/^_with_//g'`"
+                                               if `echo $BCOND|grep -q -- "--with $AVAIL_BCOND_WITH"`;then
+                                                       AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH <$AVAIL_BCOND_WITH>"
+                                               else
+                                                       AVAIL_BCONDS_WITH="$AVAIL_BCONDS_WITH $AVAIL_BCOND_WITH"
+                                               fi
+                                               ;;
                                        *)
                                                case "$cond_type" in
                                                        with)