diff --git a/0001-Remove-unnecessary-build-deps.patch b/0001-Remove-unnecessary-build-deps.patch new file mode 100644 index 0000000000000000000000000000000000000000..3e3376a36f419f1f112b251b149bd2d3ca15933a --- /dev/null +++ b/0001-Remove-unnecessary-build-deps.patch @@ -0,0 +1,31 @@ +%pyproject_wheel already pulls in setuptools and handles the build +without any additional dependencies. python-build is also not included +in RHEL. + +pyproject.toml changes are Fedora-specific +setup.cfg changes from commit e27b28c6b3ca8c9155bff38891189eb73deab611 + +diff --git a/pyproject.toml b/pyproject.toml +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,3 @@ +-[build-system] +-build-backend = "setuptools.build_meta" +-requires = ["setuptools"] + + # for black and mypy, set the lowest Python version supported + [tool.black] +diff --git a/setup.cfg b/setup.cfg +--- 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: + diff --git a/SCons-4.6.0.tar.gz b/SCons-4.6.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0572279241ec9d358bbb53012ae21f22a1c08242 Binary files /dev/null and b/SCons-4.6.0.tar.gz differ diff --git a/scons-doc-4.6.0.tar.gz b/scons-doc-4.6.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9eecffab837b6838796c33194f83833a2ec6c00d Binary files /dev/null and b/scons-doc-4.6.0.tar.gz differ diff --git a/scons.spec b/scons.spec index d4f0cba94b82051684c818f434405563f6da638e..672875e4735e312e3b4c32d6346f547c6b9e6c9e 100644 --- a/scons.spec +++ b/scons.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 1 %bcond_with debug %bcond_without doc @@ -6,13 +6,14 @@ %bcond_with python3_other Name: scons -Version: 4.3.0 +Version: 4.6.0 Release: %{anolis_release}%{dist} Summary: An Open Source software construction tool License: MIT URL: http://www.scons.org -Source0: https://github.com/SCons/scons/archive/%{version}/scons-%{version}.tar.gz -Source1: https://scons.org/doc/production/scons-doc-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/S/SCons/SCons-4.6.0.tar.gz +Source1: https://scons.org/doc/production/scons-doc-4.6.0.tar.gz +Patch1: 0001-Remove-unnecessary-build-deps.patch BuildArch: noarch BuildRequires: make @@ -79,6 +80,7 @@ Summary: An Open Source software construction tool BuildRequires: python%{python3_other_pkgversion}-devel BuildRequires: python%{python3_other_pkgversion}-lxml BuildRequires: python%{python3_other_pkgversion}-setuptools +BuildRequires: pyproject-rpm-macros Provides: scons-%{__python3_other} = %{version}-%{release} %{?python_provide:%python_provide python%{python3_other_pkgversion}-%{name}} @@ -244,6 +246,10 @@ popd %endif %changelog +* Tue Oct 28 2025 wenyuzifang - 4.6.0-1 +- Updated to version 4.6.0 to fix xxxxxx +- Remove redundant build dependencies to ensure compatibility with RHEL/Fedora packaging tools + * Mon Mar 11 2024 Zhao Hang - 4.3.0-2 - Rebuild with python3.11