do not remove macros.build from macrofiles for parsing spec

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

diff --git a/adapter.awk b/adapter.awk
index adbe5ae4fe44e7f104b1d12795170621974f10f7..cd6e688a4785b89acac9b6bcc86ad815416f1d7b 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -753,6 +753,8 @@ preamble == 1 {
                }
                if (l == "Apache License 2.0" || \
                           l == "Apache 2.0" || \
+                          l == "Apache 2" || \
+                          l == "Apache License (2.0)" ||
                           l == "Apache License Version 2.0" || \
                           l == "Apache License, Version 2.0" || \
                           l == "Apache Software License v2" || \
@@ -772,6 +774,9 @@ preamble == 1 {
                if (l == "GPLv2") {
                        l = "GPL v2"
                }
+               if (l == "The BSD 3-Clause License") {
+                       l = "BSD"
+               }
                if (l == "GPLv2+") {
                        l = "GPL v2+"
                }
@@ -1109,6 +1114,7 @@ function use_macros()
        gsub(ruby_rubylibdir, "%{ruby_rubylibdir}") # deprecated
        gsub(ruby_rdocdir, "%{ruby_rdocdir}")
        gsub(ruby_ridir, "%{ruby_ridir}")
+       gsub(ruby_specdir, "%{ruby_specdir}")
 
        gsub("%{_unitdir}", "%{systemdunitdir}")
        gsub(systemdunitdir, "%{systemdunitdir}")
@@ -1201,6 +1207,12 @@ function use_macros()
                        continue;
                if ($c ~ sysconfdir "/{?xdg")
                        continue;
+               if ($c ~ sysconfdir "/{?NetworkManager")
+                       continue;
+               if ($c ~ sysconfdir "/{?default")
+                       continue;
+               if ($c ~ sysconfdir "/{?pm")
+                       continue;
                if ($c ~ sysconfdir "/shells")
                        continue;
                if ($c ~ sysconfdir "/inittab")
@@ -1829,7 +1841,7 @@ function import_rpm_macros(  v) {
        }
 
        # update this version dep each time some new macro export is added
-       v = 1.49
+       v = 1.51
        if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < v) {
                printf("adapter shell script is outdated: Need %s, got %s. Please update it.\n", v, ENVIRON["ADAPTER_REVISION"]) > "/dev/stderr"
                do_not_touch_anything = 1
@@ -1884,6 +1896,7 @@ function import_rpm_macros(  v) {
        ruby_rubylibdir = ENVIRON["ruby_rubylibdir"] # deprecated
        ruby_rdocdir = ENVIRON["ruby_rdocdir"]
        ruby_ridir = ENVIRON["ruby_ridir"]
+       ruby_specdir = ENVIRON["ruby_specdir"]
 
        php_pear_dir = ENVIRON["php_pear_dir"]
        php_data_dir = ENVIRON["php_data_dir"]
@@ -2217,6 +2230,7 @@ function replace_requires(field,   pkg) {
        sub(/^pytalloc$/, "python-talloc", $2);
        sub(/^pytalloc-devel$/, "python-talloc-devel", $2);
        sub(/^pytest$/, "python-pytest", $2);
+       sub(/^python-crypto$/, "python-Crypto", $2);
        sub(/^python-cups$/, "python-pycups", $2);
        sub(/^python-enchant$/, "python-pyenchant", $2);
        sub(/^python-imaging$/, "python-PIL", $2);