SPECS: builder - handle new bconds correctly after rpm-find-spec-b...

twittner twittner at pld-linux.org
Sun Aug 21 19:35:52 CEST 2005


Author: twittner                     Date: Sun Aug 21 17:35:52 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- handle new bconds correctly after rpm-find-spec-bcond recently fixes
  (with backward-bug-compability) by Mikolaj Kucharski <build kompuart pl>

---- Files affected:
SPECS:
   builder (1.322 -> 1.323) 

---- Diffs:

================================================================
Index: SPECS/builder
diff -u SPECS/builder:1.322 SPECS/builder:1.323
--- SPECS/builder:1.322	Sun Jul 31 03:21:03 2005
+++ SPECS/builder	Sun Aug 21 19:35:46 2005
@@ -1045,6 +1045,22 @@
 					_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)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/builder?r1=1.322&r2=1.323&f=u




More information about the pld-cvs-commit mailing list