From: Elan Ruusamäe <glen@delfi.ee>
Date: Tue, 24 Dec 2013 20:28:04 +0000 (+0200)
Subject: java package unify
X-Git-Tag: auto/th/rpm-build-tools-4.5-13~19
X-Git-Url: https://git.pld-linux.org/?p=packages%2Frpm-build-tools.git;a=commitdiff_plain;h=1e8a794b460cbec341d4daa78d676a8ff6a238f9

java package unify
---

diff --git a/adapter.awk b/adapter.awk
index 9896f29..5604ade 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -2115,11 +2115,14 @@ function replace_requires(field,   pkg) {
 	sub(/^jakarta-ant$/, "ant", $2);
 	sub(/^jakarta-commons-codec$/, "java-commons-codec", $2);
 	sub(/^jakarta-commons-httpclient$/, "java-commons-httpclient", $2);
+	sub(/^jakarta-commons-lang24$/, "java-commons-lang", $2);
 	sub(/^jakarta-commons-logging$/, "java-commons-logging", $2);
+	sub(/^jakarta-commons-net$/, "java-commons-net", $2);
 	sub(/^jakarta-log4j$/, "java-log4j", $2);
 	sub(/^jakarta-oro$/, "java-oro", $2);
 	sub(/^jakarta-servletapi$/, "java(servlet)", $2);
 	sub(/^java-devel$/, "jdk", $2);
+	sub(/^java-dom$/, "java-dom4j", $2);
 	sub(/^java\(JSP\)$/, "java(jsp)", $2);
 	sub(/^java\(JavaServerFaces\)$/, "java(javaserverfaces)", $2);
 	sub(/^java\(Portlet\)$/, "java(portlet)", $2);