SPECS: adapter.awk - damn adapter, can't live with it and without it
glen
glen at pld-linux.org
Mon Jan 2 18:55:33 CET 2006
Author: glen Date: Mon Jan 2 17:55:33 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- damn adapter, can't live with it and without it
---- Files affected:
SPECS:
adapter.awk (1.265 -> 1.266)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.265 SPECS/adapter.awk:1.266
--- SPECS/adapter.awk:1.265 Mon Jan 2 17:47:33 2006
+++ SPECS/adapter.awk Mon Jan 2 18:55:27 2006
@@ -766,7 +766,7 @@
sub(/PreReq:/, "Requires:", $1);
}
format_preamble()
- kill_preamble_macros();
+# kill_preamble_macros(); # breaks tabbing
b_idx++;
l = substr($0, index($0, $2));
@@ -1265,8 +1265,12 @@
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 +1289,7 @@
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);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.265&r2=1.266&f=u
More information about the pld-cvs-commit
mailing list