- BuildConflicts after BuildRequires

[packages/rpm-build-tools.git] / adapter.awk

diff --git a/adapter.awk b/adapter.awk
index 1407bdbdc0e4fb4e0ba6015ca28b31c4c235c9fb..e52e025d4d78ef8a5277e4d519dbb7bbecba36dc 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -120,6 +120,8 @@ function b_makekey(a, b,    s) {
     gsub(/^Group/, "6Group", s);
     gsub(/^URL/, "7URL", s);
 
+    gsub(/^BuildRequires/, "B1BuildRequires", s);
+    gsub(/^BuildConflicts/, "B2BuildConflicts", s);
     gsub(/^Provides/, "X1Provides", s);
     gsub(/^Obsoletes/, "X2Obsoletes", s);
     gsub(/^Conflicts/, "X3Conflicts", s);
@@ -766,7 +768,7 @@ ENVIRON["SKIP_SORTBR"] != 1 && preamble == 1 && $0 ~ PREAMBLE_TAGS, $0 ~ PREAMBL
                sub(/PreReq:/, "Requires:", $1);
        }
        format_preamble()
-       kill_preamble_macros();
+#      kill_preamble_macros(); # breaks tabbing
 
        b_idx++;
        l = substr($0, index($0, $2));
@@ -1265,8 +1267,12 @@ function cflags(var)
 
 function demacroize(str)
 {
-       sub("%{mod_name}", mod_name, str);
-       sub("%{name}", name, str);
+       if (mod_name) {
+               sub("%{mod_name}", mod_name, str);
+       }
+       if (name) {
+               sub("%{name}", name, str);
+       }
        if (version) {
                sub("%{version}", version, str);
        }
@@ -1285,6 +1291,7 @@ function demacroize(str)
 function kill_preamble_macros()
 {
        if ($1 ~ /^URL:/ || $1 ~ /^Obsoletes:/) {
+               # NB! assigning $2 a value breaks tabbing
                $2 = demacroize($2);
                # unify sourceforge url
                sub("\.sf\.net/$", ".sourceforge.net/", $2);
@@ -1292,6 +1299,10 @@ function kill_preamble_macros()
 }
 
 function format_requires(tag, value,   n, p, i, deps, ndeps) {
+       # skip any formatting for commented out items
+       if (/^#/) {
+               return tag "\t" value
+       }
        n = split(value, p, / *,? */);
        for (i = 1; i <= n; i++) {
                if (p[i+1] ~ /[<=>]/) {