From 3e12e2727f50a608cfa4ad0b13b57c28b3d56d52 Mon Sep 17 00:00:00 2001 From: hht8 Date: Mon, 30 Nov 2020 17:29:40 +0800 Subject: [PATCH 1/4] Fix help package rollback error --- scons.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scons.spec b/scons.spec index 8dd2228..f0968ba 100644 --- a/scons.spec +++ b/scons.spec @@ -1,6 +1,6 @@ Name: scons Version: 3.1.1 -Release: 2 +Release: 3 Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org @@ -15,11 +15,11 @@ classic Make utility with integrated functionality similar to autoconf/automake and compiler caches such as ccache. In short, SCons is an easier, more reliable and faster way to build software. -%package doc +%package help Summary: An Open Source software construction tool BuildArch: noarch -%description doc +%description help Scons HTML documentation. %package -n python2-%{name} @@ -155,11 +155,14 @@ popd %{python3_sitelib}/scons-%{version}*.egg-info %{_mandir}/man?/* -%files doc +%files help %doc HTML %license %{name}-%{version}/src/LICENSE.txt %changelog +* Mon Nov 30 2020 huanghaitao - 3.1.1-3 +- Fix help package rollback error + * Thu Jun 4 2020 Captain Wei - 3.1.1-2 - update package version -- Gitee From 777ea94cc97001d865d4351939f5435a628733dc Mon Sep 17 00:00:00 2001 From: lingsheng Date: Wed, 2 Dec 2020 15:43:42 +0800 Subject: [PATCH 2/4] Resolve conflicts in upgrading --- scons.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scons.spec b/scons.spec index f0968ba..492b09f 100644 --- a/scons.spec +++ b/scons.spec @@ -1,6 +1,6 @@ Name: scons Version: 3.1.1 -Release: 3 +Release: 4 Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org @@ -25,8 +25,9 @@ Scons HTML documentation. %package -n python2-%{name} Summary: An Open Source software construction tool BuildRequires: python2-devel +Requires: %{name}-help = %{version}-%{release} %{?python_provide:%python_provide python2-%{name}} -Provides: scons-python2 = 0:%{version}-%{release} +Provides: scons-python2 = 0:%{version}-%{release} %description -n python2-%{name} SCons is an Open Source software construction tool—that is, a next-generation @@ -39,6 +40,7 @@ and faster way to build software. Summary: An Open Source software construction tool BuildRequires: python3-devel +Requires: %{name}-help = %{version}-%{release} Provides: scons = 0:%{version}-%{release} Provides: scons-python3 Obsoletes: scons < 0:5.0.3-3 @@ -142,7 +144,6 @@ popd %{_bindir}/%{name}*-%{python2_version} %{python2_sitelib}/SCons/ %{python2_sitelib}/scons-%{version}*.egg-info -%{_mandir}/man?/* %files -n python3-%{name} %doc %{name}-%{version}-py3/src/CHANGES.txt %{name}-%{version}-py3/src/README.txt %{name}-%{version}-py3/src/RELEASE.txt @@ -153,13 +154,16 @@ popd %{_bindir}/%{name}*-%{python3_version} %{python3_sitelib}/SCons/ %{python3_sitelib}/scons-%{version}*.egg-info -%{_mandir}/man?/* %files help %doc HTML %license %{name}-%{version}/src/LICENSE.txt +%{_mandir}/man?/* %changelog +* Wed Dec 02 2020 lingsheng - 3.1.1-4 +- Resolve conflicts in upgrading + * Mon Nov 30 2020 huanghaitao - 3.1.1-3 - Fix help package rollback error -- Gitee From ece564d8359c209c51807e144bc5d16854a22f35 Mon Sep 17 00:00:00 2001 From: lingsheng Date: Wed, 23 Dec 2020 10:35:22 +0800 Subject: [PATCH 3/4] Keep spec name same as package --- scons.spec => python-scons.spec | 5 ++++- scons.yaml => python-scons.yaml | 0 2 files changed, 4 insertions(+), 1 deletion(-) rename scons.spec => python-scons.spec (98%) rename scons.yaml => python-scons.yaml (100%) diff --git a/scons.spec b/python-scons.spec similarity index 98% rename from scons.spec rename to python-scons.spec index 492b09f..f47552a 100644 --- a/scons.spec +++ b/python-scons.spec @@ -1,6 +1,6 @@ Name: scons Version: 3.1.1 -Release: 4 +Release: 5 Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org @@ -161,6 +161,9 @@ popd %{_mandir}/man?/* %changelog +* Wed Dec 23 2020 lingsheng - 3.1.1-5 +- Keep spec name same as package + * Wed Dec 02 2020 lingsheng - 3.1.1-4 - Resolve conflicts in upgrading diff --git a/scons.yaml b/python-scons.yaml similarity index 100% rename from scons.yaml rename to python-scons.yaml -- Gitee From fb66f67d0905529dfa845bf56f79d42fcb9e62c1 Mon Sep 17 00:00:00 2001 From: zhang-liang-pengkun Date: Thu, 9 Nov 2023 20:36:41 +0800 Subject: [PATCH 4/4] apply subst fix from #3428 Signed-off-by: zhang-liang-pengkun --- 0001-PR-3434-apply-subst-fix-from-3428.patch | 40 ++++++++++++++++++++ python-scons.spec | 6 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 0001-PR-3434-apply-subst-fix-from-3428.patch 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 0000000..95a75dd --- /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 f47552a..1be1972 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 -- Gitee