From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 20 May 2022 14:35:19 +0000 (+0200)
Subject: - 2.017: adjusted __noautodep_helper to use stdin to compensate mawk vs gawk argument... 
X-Git-Tag: auto/th/rpm-pld-macros-2.017-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=6482bd8f0f24a16a58f6010bd422b5f7b3756819;p=packages%2Frpm-pld-macros.git

- 2.017: adjusted __noautodep_helper to use stdin to compensate mawk vs gawk argument escaping differences
---

diff --git a/macros.pld b/macros.pld
index abe4fa3..b2b26c0 100644
--- a/macros.pld
+++ b/macros.pld
@@ -1179,10 +1179,12 @@ fi; \
 	%{?_noautoreq_py3egg: %{__noauto_regexp_helper -p python3egg %{_noautoreq_py3egg}}} \
 	%{nil}
 
-%__noautodep_helper() %(awk -v x="%*" 'BEGIN {
+%__noautodep_helper() %(echo '%*' | awk 'BEGIN {
 	RS = "\n([ \t]+\n)+";
 	FS = " ";
-	split(x, F);
+}
+{
+	split($0, F);
 	if (length(F) > 0) {
 		printf("(");
 		for (i=1; i<=length(F); i++) {
@@ -1221,7 +1223,7 @@ fi; \
 # %define _noautoprov_pyegg excluded
 # %define _noautoprov_py3egg excluded3
 #
-%__noauto_regexp_helper(p:) %(echo "%*" | awk 'BEGIN{RS=" "}{printf("%{-p*}%{__qchar}(%%s%{__qchar}) ", $1)}')
+%__noauto_regexp_helper(p:) %(echo '%*' | awk 'BEGIN{RS=" "}{printf("%{-p*}%{__qchar}(%%s%{__qchar}) ", $1)}')
 # detect quote character runtime
 %__qchar_4 \\\\%{nil}
 %__qchar_5 \\\\\\%{nil}
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 3ae7d04..1c63bc1 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.016
+%define		rpm_macros_rev	2.017
 %define		find_lang_rev	1.40
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15