From: twittner <twittner@pld-linux.org>
Date: Sun, 21 Aug 2005 17:35:46 +0000 (+0000)
Subject: - handle new bconds correctly after rpm-find-spec-bcond recently fixes
X-Git-Tag: auto/ac/rpm-4_4_2-10~2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=f8d24ceef09551b7c85c683a2828a0fc10e3b502;p=packages%2Frpm-build-tools.git

- 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 ca5009e..3935293 100644
--- 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)