adapter: isa, mpl

diff --git a/adapter.awk b/adapter.awk
index e71edefd4dbb0a9c68ec67a42e6e8a8832e5bc22..33144830e08b33d0063705457aba6610c4106de0 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -830,6 +830,9 @@ preamble == 1 {
                if (l == "MPLv1.1") {
                        l = "MPL v1.1"
                }
+               if (l == "Mozilla Public License, version 2.0") {
+                       l = "MPL v2.0"
+               }
                $0 = "License:\t" l
        }
 
@@ -2168,6 +2171,11 @@ function replace_pythonegg(pkg,    cmd, line) {
 # }}}
 
 function replace_requires(field,   pkg) {
+       # strip %{?_isa}
+       if ($2 ~ /_isa/) {
+               $2 = fixedsub("%{?_isa}", "", $2);
+       }
+
        # pkg-config -> package names
        if (match($2, /pkgconfig\(([^)]+)\)/)) {
                pkg = substr($2, RSTART + 10, RLENGTH - 11)