- don't expand anything in if STRIP_NOEXPAND is set

diff --git a/noexpand.patch b/noexpand.patch
index 9badc22bb07d8df1688812d1aa83504593d7c468..e75a513f9a191351fc86f445dd4ceb965b9a11d9 100644 (file)
--- a/noexpand.patch
+++ b/noexpand.patch
@@ -23,6 +23,15 @@ diff -ur rpm-4.16.0/build/parseSpec.c rpm-4.16.0-noexpand/build/parseSpec.c
  
      if (specExpand(spec, ofi->lineNum, spec->lbuf, &lbuf))
        return 1;
+@@ -476,7 +476,7 @@
+     lineType = copyNextLineFinish(spec, strip);
+     s = spec->line;
+     SKIPSPACE(s);
+-    if (!lineType)
++    if (!lineType || (strip & STRIP_NOEXPAND))
+       goto after_classification;
+ 
+     /* check ordering of the conditional */
 diff -ur rpm-4.16.0/build/rpmbuild_internal.h rpm-4.16.0-noexpand/build/rpmbuild_internal.h
 --- rpm-4.16.0/build/rpmbuild_internal.h       2020-12-18 20:09:28.354868788 +0100
 +++ rpm-4.16.0-noexpand/build/rpmbuild_internal.h      2020-12-18 20:09:09.054827168 +0100