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

[sparky]

Author: sparky                       Date: Tue Apr  6 23:15:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- detect BR: inside %{?...}

---- Files affected:
packages:
   ci (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/ci
diff -u packages/ci:1.2 packages/ci:1.3
--- packages/ci:1.2	Sat Apr  3 23:35:13 2010
+++ packages/ci	Wed Apr  7 01:15:07 2010
@@ -61,18 +61,32 @@
 
 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 }')
+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; };
+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}"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ci?r1=1.2&r2=1.3&f=u