Check for name/CVS dir when looking for sticky name. Old test failed if under name...

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

diff --git a/adapter.sh b/adapter.sh
index 43d1d3989c26324d9552cb9345f890bffd25cb50..44a4ee28f296a0d8370e89fb25bfe37bcf273ba4 100644 (file)
--- a/adapter.sh
+++ b/adapter.sh
@@ -195,6 +195,7 @@ import_rpm_macros() {
        _javadir
        _pkgconfigdir
        _npkgconfigdir
+       _localedir
 
        perl_sitearch
        perl_archlib
@@ -208,6 +209,11 @@ import_rpm_macros() {
        py_scriptdir
        py_ver
 
+       py3_sitescriptdir
+       py3_sitedir
+       py3_scriptdir
+       py3_ver
+
        ruby_archdir
        ruby_ridir
        ruby_rubylibdir
@@ -218,6 +224,9 @@ import_rpm_macros() {
        php_pear_dir
        php_data_dir
        tmpdir
+
+       systemdunitdir
+       systemdtmpfilesdir
 "
        eval_expr=""
        for macro in $macros; do