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

diff --git a/macros.pld b/macros.pld
index abe4fa33c8b73d4a5e14698959eb66dfd72e19b3..b2b26c0b21bc09132bbb3f77782a0e1bea5a88e0 100644 (file)
--- 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 3ae7d04bbdce78b76789b7ebf15caab170b14215..1c63bc19db1243d929cb791eda5cd371cc71afc8 100644 (file)
--- 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