[packages/adapter: 388/631] - replace pkg names also for BR not just R

[glen]

commit 92fa789e916feda980e8542710109af2ba2719bf
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Dec 9 11:17:31 2007 +0000

    - replace pkg names also for BR not just R
    
    Changed files:
        adapter.awk -> 1.370

 adapter.awk | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index c2cea01..06f3fe7 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -760,26 +760,11 @@ preamble == 1 {
 			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 @@ function add_br(br)
 	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()
 {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885