[packages/rpm-build-tools] adapter: isa, mpl

glen glen at pld-linux.org
Fri May 8 20:36:12 CEST 2015


commit 068db51ca359f65b97a42d70e61f0aa028b2559e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri May 8 21:36:00 2015 +0300

    adapter: isa, mpl

 adapter.awk | 8 ++++++++
 1 file changed, 8 insertions(+)
---
diff --git a/adapter.awk b/adapter.awk
index e71edef..3314483 100644
--- 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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/068db51ca359f65b97a42d70e61f0aa028b2559e



More information about the pld-cvs-commit mailing list