- always translate %%{ix86} to %%{_target_cpu}

[packages/rpm.git] / rpm-find-spec-bcond

diff --git a/rpm-find-spec-bcond b/rpm-find-spec-bcond
index 82343531a0e501dde88922ad9880ece3e9c3277c..40ad15495ed80ba83e674d8bfbf32c90aa20daf3 100644 (file)
--- a/rpm-find-spec-bcond
+++ b/rpm-find-spec-bcond
@@ -23,10 +23,16 @@ fi
 
 bconds=`awk -F"\n" 'BEGIN { chlog=0 }
                /^%changelog/ { chlog=1 }
-               /_with(out)?_[_a-z0-9]+/ && chlog == 0 {
-                       match($0, /_with(out)?_[_a-z0-9]+/);
+               /_with(out)?_[_a-zA-Z0-9]+/ && chlog == 0 {
+                       match($0, /_with(out)?_[_a-zA-Z0-9]+/);
                        print substr($0, RSTART, RLENGTH)                       
-               }' $SPEC | sort -u`
+               }
+               /^%bcond_with/ && chlog == 0 {
+                       match($0, /bcond_with(out)?[    ]+[_a-zA-Z0-9]+/);
+                                bcond = substr($0, RSTART +5 , RLENGTH -5);
+                                gsub(/ /,"_",bcond);
+                                print bcond
+                       }' $SPEC | sort -u`
 
 for c in $bconds; do
     echo -n "$c"
@@ -51,7 +57,7 @@ for bcond in $bconds; do
                      }
                   } END { print val }" $SPEC`;
 
-    if [ $isset -eq 1 ]; then
+    if [ x"$isset" = x"1" ]; then
        echo "WARN: $bcond defined in spec";
     fi
 done