From 7285bc93a69949153e1bea4b23059e902e5773a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 18 Dec 2020 23:04:35 +0100 Subject: [PATCH] - don't expand anything in if STRIP_NOEXPAND is set --- noexpand.patch | 9 +++++++++ 1 file changed, 9 insertions(+) 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 -- 2.43.0