diff --git a/0001-PR-3434-apply-subst-fix-from-3428.patch b/0001-PR-3434-apply-subst-fix-from-3428.patch new file mode 100644 index 0000000000000000000000000000000000000000..95a75dd8b0c56ed55a4ce911614d395f85538cfb --- /dev/null +++ b/0001-PR-3434-apply-subst-fix-from-3428.patch @@ -0,0 +1,40 @@ +From 581a6912938f3143b2c31dcb78ecc9928da124df Mon Sep 17 00:00:00 2001 +From: Mats Wichmann +Date: Sun, 8 Sep 2019 06:17:29 -0600 +Subject: [PATCH] [PR #3434] apply subst fix from #3428 + +Signed-off-by: Mats Wichmann +--- + src/CHANGES.txt | 2 ++ + src/engine/SCons/Subst.py | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/CHANGES.txt b/src/CHANGES.txt +index 953931b..885a018 100644 +--- a/src/CHANGES.txt ++++ b/src/CHANGES.txt +@@ -3,6 +3,8 @@ + SCons - a software construction tool + + Change Log ++ From Mats Wichmann ++ - CmdStringHolder fix from issue #3428 + + RELEASE 3.1.1 - Mon, 07 Aug 2019 20:09:12 -0500 + +diff --git a/src/engine/SCons/Subst.py b/src/engine/SCons/Subst.py +index 6f62198..2de64c5 100644 +--- a/src/engine/SCons/Subst.py ++++ b/src/engine/SCons/Subst.py +@@ -409,7 +409,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={ + handles separating command lines into lists of arguments, so see + that function if that's what you're looking for. + """ +- if isinstance(strSubst, str) and strSubst.find('$') < 0: ++ if (isinstance(strSubst, str) and '$' not in strSubst) or isinstance(strSubst, CmdStringHolder): + return strSubst + + class StringSubber(object): +-- +2.39.0.windows.2 + diff --git a/python-scons.spec b/python-scons.spec index f47552a2cf0128a965bbe2e8c312863c0437470a..1be19724ba6eed4673a497b2f68612ceeab47783 100644 --- a/python-scons.spec +++ b/python-scons.spec @@ -1,11 +1,12 @@ Name: scons Version: 3.1.1 -Release: 5 +Release: 6 Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org Source0: https://github.com/SCons/scons/archive/scons-%{version}.tar.gz Source1: https://scons.org/doc/%{version}/scons-doc-%{version}.tar.gz +Patch0001: 0001-PR-3434-apply-subst-fix-from-3428.patch BuildArch: noarch %description @@ -161,6 +162,9 @@ popd %{_mandir}/man?/* %changelog +* Thu Nov 09 2023 zhangliangpengkun - 3.1.1-6 +- apply subst fix from #3428 + * Wed Dec 23 2020 lingsheng - 3.1.1-5 - Keep spec name same as package