- added systemd directories macros

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

diff --git a/adapter.awk b/adapter.awk
index 82c1e98506eea7e2e002cd8eb93446e49a5ec545..2945f11ebe444107b6beb344cb0a69fcdea37e37 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -1200,6 +1200,9 @@ function use_macros()
        gsub(libdir, "%{_libdir}")
        gsub(javadir, "%{_javadir}")
 
+       gsub(systemdunitdir, "%{systemdunitdir}")
+       gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
+
        gsub(bindir, "%{_bindir}")
        gsub("%{prefix}/bin", "%{_bindir}")
        if (prefix"/bin" == bindir)
@@ -1458,9 +1461,6 @@ function use_macros()
        if (pear_subclass) {
                gsub("%{_subclass}", pear_subclass);
        }
-
-       gsub("/lib/systemd/system", "%{systemdunitdir}")
-
 }
 
 function format_configure(line,                n, a, s) {
@@ -1957,6 +1957,9 @@ function import_rpm_macros() {
        php_pear_dir = ENVIRON["php_pear_dir"]
        php_data_dir = ENVIRON["php_data_dir"]
        tmpdir = ENVIRON["tmpdir"]
+
+       systemdunitdir = ENVIRON["systemdunitdir"]
+       systemdtmpfilesdir = ENVIRON["systemdtmpfilesdir"]
 }
 
 # php virtual deps as discussed in devel-en
@@ -2135,6 +2138,8 @@ function replace_requires() {
        sub(/^wsdl4j$/, "java-wsdl4j", $2);
        sub(/^xalan-j$/, "java-xalan", $2);
        sub(/^xalan-j2$/, "java-xalan", $2);
+       sub(/^xerces-j$/, "java-xerces", $2);
+       sub(/^xerces-j2$/, "java-xerces", $2);
        sub(/^xml-commons-apis$/, "java-xml-commons", $2);
        sub(/^xml-commons-resolver$/, "java-xml-commons-resolver", $2);
        sub(/^xmldb-api$/, "java-xmldb", $2);