SPECS: adapter.awk - replace pkg names also for BR not just R

[glen]

Author: glen                         Date: Sun Dec  9 11:17:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- replace pkg names also for BR not just R

---- Files affected:
SPECS:
   adapter.awk (1.369 -> 1.370) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.369 SPECS/adapter.awk:1.370
--- SPECS/adapter.awk:1.369	Sun Dec  2 16:07:28 2007
+++ SPECS/adapter.awk	Sun Dec  9 12:17:31 2007
@@ -760,26 +760,11 @@
 			next
 		}
 
-		# perhaps we have common known name?
-
-		# jpackages
-		sub(/^java-devel$/, "jdk", $2);
-		sub(/^log4j$/, "logging-log4j", $2);
-		sub(/^jakarta-log4j$/, "logging-log4j", $2);
-		sub(/^oro$/, "jakarta-oro", $2);
-		sub(/^jakarta-ant$/, "ant", $2);
-		sub(/^xerces-j2$/, "xerces-j", $2);
-		sub(/^ldapjdk$/, "ldapsdk", $2);
-		sub(/^saxon-scripts$/, "saxon", $2);
-		sub(/^xalan-j2$/, "xalan-j", $2);
-		sub(/^xerces-j2$/, "xerces-j", $2);
-		sub(/^gnu-regexp$/, "gnu.regexp", $2);
-
-		replace_php_virtual_deps();
+		replace_requires();
 	}
 
 	if (field ~ /^requires:/) {
-		replace_php_virtual_deps();
+		replace_requires();
 	}
 
 
@@ -1664,6 +1649,28 @@
 	BR[BR_count++] = br
 }
 
+function replace_requires()
+{
+
+	# jpackages
+	sub(/^java-devel$/, "jdk", $2);
+	sub(/^log4j$/, "logging-log4j", $2);
+	sub(/^jakarta-log4j$/, "logging-log4j", $2);
+	sub(/^oro$/, "jakarta-oro", $2);
+	sub(/^jakarta-ant$/, "ant", $2);
+	sub(/^xerces-j2$/, "xerces-j", $2);
+	sub(/^ldapjdk$/, "ldapsdk", $2);
+	sub(/^saxon-scripts$/, "saxon", $2);
+	sub(/^xalan-j2$/, "xalan-j", $2);
+	sub(/^xerces-j2$/, "xerces-j", $2);
+	sub(/^gnu-regexp$/, "gnu.regexp", $2);
+
+	# redhat virtual
+	sub(/^tftp-server$/, "tftpdaemon", $2);
+
+	replace_php_virtual_deps()
+}
+
 # php virtual deps as discussed in devel-en
 function replace_php_virtual_deps()
 {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/adapter.awk?r1=1.369&r2=1.370&f=u