- detect BR: inside %{?...}

Changed files:
    ci -> 1.3

diff --git a/ci b/ci
index d51d74516597680fb842b9cbe1f1fca4bda047cf..6084ba3d79ecc7ab819a90d739a5ca4e535a8866 100644 (file)
--- a/ci
+++ b/ci
@@ -61,18 +61,32 @@ diff="$(cvs -z9 diff -u $SPEC)"
 
 echo "$diff" | diffcol
 
-ver=$(echo "$diff" | awk '/^\+Version/ { ver = $2 } /^\+%define[ \t]+[_a-zA-Z0-9]*ver/ { ver = $3 }
-       END { print ver }')
-rel=$(echo "$diff" | awk '/^\+Release/ { rel = $2 } /^\+%define[ \t]+_?rel/ { rel = $3 }
-       END { print rel }')
-
-add=$(echo "$diff" | awk '/^\+BuildRequires/ { add[ $2 ] = 1; }; /^-BuildRequires/ { del[ $2 ] = 1; };
+ver=$(echo "$diff" | awk '
+       /^\+Version/ { ver = $2 }
+       /^\+%define[ \t]+[_a-zA-Z0-9]*ver/ { ver = $3 }
+       END { print ver }
+')
+rel=$(echo "$diff" | awk '
+       /^\+Release/ { rel = $2 }
+       /^\+%define[ \t]+_?rel/ { rel = $3 }
+       END { print rel }
+')
+
+add=$(echo "$diff" | awk '
+       function s( n ) { sub(/}/,"",n); return n; }
+       /^\+(%{[a-zA-Z0-9_]+:)?BuildRequires/ { add[ s( $2 ) ] = 1; };
+       /^-(%{[a-zA-Z0-9_]+:)?BuildRequires/ { del[ s( $2 ) ] = 1; };
        END { for ( n in add ) { if ( !del[ n ] ) print n; } }' | 
-       perl -p -e 'chomp; push @a, $_; undef $_; END { print join ", ", sort @a }')
+       perl -p -e 'chomp; push @a, $_; undef $_; END { print join ", ", sort @a }
+')
 
-del=$(echo "$diff" | awk '/^\+BuildRequires/ { add[ $2 ] = 1; }; /^-BuildRequires/ { del[ $2 ] = 1; };
+del=$(echo "$diff" | awk '
+       function s( n ) { sub(/}/,"",n); return n; }
+       /^\+(%{[a-zA-Z0-9_]+:)?BuildRequires/ { add[ s( $2 ) ] = 1; };
+       /^-(%{[a-zA-Z0-9_]+:)?BuildRequires/ { del[ s( $2 ) ] = 1; };
        END { for ( n in del ) { if ( !add[ n ] ) print n; } }' |
-       perl -p -e 'chomp; push @a, $_; undef $_; END { print join ", ", sort @a }')
+       perl -p -e 'chomp; push @a, $_; undef $_; END { print join ", ", sort @a }
+')
 
 n="$(echo -e '\nn')"
 n="${n%%n}"