diff --git a/SPECS/scons/0001-Remove-unnecessary-build-deps.patch b/SPECS/scons/0001-Remove-unnecessary-build-deps.patch new file mode 100644 index 0000000000..87806395dc --- /dev/null +++ b/SPECS/scons/0001-Remove-unnecessary-build-deps.patch @@ -0,0 +1,56 @@ +From e6dd33f678acbbbbbb7d7ad3c795ad7b76db934c Mon Sep 17 00:00:00 2001 +From: amritakohli +Date: Thu, 1 Feb 2024 15:31:24 -0800 +Subject: [PATCH] Patch to remove incorrect dependencies from setup.cfg. + Changes taken from + https://src.fedoraproject.org/rpms/scons/blob/rawhide/f/0001-Remove-unnecessary-build-deps.patch. + Modified for CBL-Mariner by Amrita Kohli + +--- + PKG-INFO | 1 - + pyproject.toml | 4 ---- + setup.cfg | 4 ---- + 3 files changed, 9 deletions(-) + +diff --git a/PKG-INFO b/PKG-INFO +index a883d81..3253a83 100644 +--- a/PKG-INFO ++++ b/PKG-INFO +@@ -34,7 +34,6 @@ Classifier: Operating System :: Microsoft :: Windows + Requires-Python: >=3.6 + Description-Content-Type: text/x-rst + License-File: LICENSE +-Requires-Dist: setuptools + + SCons - a Software Construction Tool + #################################### +diff --git a/pyproject.toml b/pyproject.toml +index 548ae2d..f470f03 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,3 @@ +-[build-system] +-build-backend = "setuptools.build_meta" +-requires = ["setuptools"] +- + # for black and mypy, set the lowest Python version supported + [tool.black] + quiet = true +diff --git a/setup.cfg b/setup.cfg +index b3b8778..16c0670 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -40,10 +40,6 @@ classifiers = + [options] + zip_safe = False + python_requires = >=3.6 +-install_requires = setuptools +-setup_requires = +- setuptools +- build + include_package_data = True + packages = find: + +-- +2.34.1 + diff --git a/SPECS/scons/scons.signatures.json b/SPECS/scons/scons.signatures.json index 6eb233f3dc..863f446af4 100644 --- a/SPECS/scons/scons.signatures.json +++ b/SPECS/scons/scons.signatures.json @@ -1,5 +1,5 @@ { - "Signatures": { - "scons-3.0.1.tar.gz": "24475e38d39c19683bc88054524df018fe6949d70fbd4c69e298d39a0269f173" - } -} + "Signatures": { + "scons-4.6.0.tar.gz": "7db28958b188b800f803c287d0680cc3ac7c422ed0b1cf9895042c52567803ec" + } +} \ No newline at end of file diff --git a/SPECS/scons/scons.spec b/SPECS/scons/scons.spec index 2cf17be4d4..456d92a6ef 100644 --- a/SPECS/scons/scons.spec +++ b/SPECS/scons/scons.spec @@ -1,11 +1,12 @@ Name: scons -Version: 3.0.1 -Release: 6%{?dist} +Version: 4.6.0 +Release: 1%{?dist} Summary: An Open Source software construction tool Group: Development/Tools License: MIT URL: http://scons.org -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Source0: https://sourceforge.net/projects/%{name}/files/%{name}/%{version}/SCons-%{version}.tar.gz/download#/%{name}-%{version}.tar.gz +Patch0: 0001-Remove-unnecessary-build-deps.patch Vendor: Microsoft Corporation Distribution: Mariner BuildRequires: python3-devel @@ -19,23 +20,26 @@ with integrated functionality similar to autoconf/automake and compiler caches s In short, SCons is an easier, more reliable and faster way to build software. %prep -%autosetup +%autosetup -p1 -n SCons-%{version} %build %py3_build %install -%{py3_install "--prefix=%{_prefix}" "--standard-lib" "--install-data=%{_datadir}"} +%{py3_install "--prefix=%{_prefix}" "--install-data=%{_datadir}"} %py3_shebang_fix %{buildroot}%{_bindir}/* %files %defattr(-,root,root,-) -%license LICENSE.txt +%license LICENSE %{python3_sitelib}/* %{_bindir}/* %{_datadir}/* %changelog +* Thu Feb 01 2024 Amrita Kohli - 4.6.0-1 +- Upgrade to 4.6.0 - For 3.0 release + * Thu Feb 17 2022 Thomas Crain - 3.0.1-6 - Build with python3 instead of python2 diff --git a/cgmanifest.json b/cgmanifest.json index 097bf69b8e..87ce28f711 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -26995,8 +26995,8 @@ "type": "other", "other": { "name": "scons", - "version": "3.0.1", - "downloadUrl": "http://downloads.sourceforge.net/scons/scons-3.0.1.tar.gz" + "version": "4.6.0", + "downloadUrl": "https://sourceforge.net/projects/scons/files/scons/4.6.0/SCons-4.6.0.tar.gz/download" } } },