From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 18 Dec 2020 22:04:35 +0000 (+0100)
Subject: - don't expand anything in if STRIP_NOEXPAND is set
X-Git-Tag: auto/th/rpm-4.16.1.2-1~13
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=7285bc9

- don't expand anything in if STRIP_NOEXPAND is set
---

diff --git a/noexpand.patch b/noexpand.patch
index 9badc22..e75a513 100644
--- 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