From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 13 Mar 2021 20:54:29 +0000 (+0100)
Subject: - 1.517, do not strip _isa, it's useful for arch deps
X-Git-Tag: auto/th/adapter-1.517-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=df752905f14c9aba91e44bfdfadf106ca559cbd6;p=packages%2Fadapter.git

- 1.517, do not strip _isa, it's useful for arch deps
---

diff --git a/adapter.awk b/adapter.awk
index 5b4d13a..5877d1c 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -33,7 +33,7 @@ BEGIN {
 	RPM_SECTIONS = "package|build|changelog|clean|description|install|post|posttrans|postun|pre|prep|pretrans|preun|triggerin|triggerpostun|triggerun|verifyscript|check"
 	SECTIONS = "^%(" RPM_SECTIONS ")"
 
-	VERSION="1.516"
+	VERSION="1.517"
 
 	PREAMBLE_TAGS = "(R|BR|Summary|Name|Version|Release|Epoch|License|Group|URL|BuildArch|BuildRoot|Obsoletes|Conflicts|Provides|ExclusiveArch|ExcludeArch|Pre[Rr]eq|(Build)?Requires|Suggests|Auto(Req|Prov))"
 
@@ -2243,11 +2243,6 @@ function replace_pythonegg(pkg,    cmd, line) {
 
 # {{{ replace_requires
 function replace_requires(pkg) { # "pkg' is local variable, not an argument
-	# strip %{?_isa}
-	if ($2 ~ /_isa/) {
-		$2 = fixedsub("%{?_isa}", "", $2);
-	}
-
 	# pkg-config -> package names
 	if (match($2, /pkgconfig\(([^)]+)\)/)) {
 		pkg = substr($2, RSTART + 10, RLENGTH - 11)
diff --git a/adapter.sh b/adapter.sh
index 9414666..f1f2548 100755
--- a/adapter.sh
+++ b/adapter.sh
@@ -12,7 +12,7 @@
 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-VERSION="1.516"
+VERSION="1.517"
 VERSIONSTRING="\
 Adapter adapts .spec files for PLD Linux.
 v$VERSION (C) 1999-2021 Free Penguins".
diff --git a/adapter.spec b/adapter.spec
index 1e82aaa..44886a5 100644
--- a/adapter.spec
+++ b/adapter.spec
@@ -1,8 +1,8 @@
 Summary:	Adapt RPM .spec files to PLD Linux coding standard
 Summary(pl.UTF-8):	Adaptowanie plików .spec pakietów RPM do standardu kodowania PLD Linuksa
 Name:		adapter
-Version:	1.516
-Release:	3
+Version:	1.517
+Release:	1
 License:	GPL
 Group:		Applications/File
 Source0:	adapter.awk