diff --git a/.gitignore b/.gitignore index 1966257..2f06b37 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,3 @@ PyYAML-3.09.tar.gz /6.0.tar.gz /6.0.1.tar.gz /6.0.2.tar.gz -/6.0.3.tar.gz diff --git a/823.patch b/823.patch new file mode 100644 index 0000000..a0c3f29 --- /dev/null +++ b/823.patch @@ -0,0 +1,56 @@ +From 74e0c6ccc615fa38ee793899ca80f3351c10c60e Mon Sep 17 00:00:00 2001 +From: Henry Schreiner +Date: Tue, 13 Aug 2024 09:48:48 -0400 +Subject: [PATCH 1/2] fix: bdist_wheel was unmodified + +--- + setup.py | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/setup.py b/setup.py +index 8040320fe..72018345c 100644 +--- a/setup.py ++++ b/setup.py +@@ -93,11 +93,6 @@ + if with_cython: + raise + +-try: +- from wheel.bdist_wheel import bdist_wheel +-except ImportError: +- bdist_wheel = None +- + + try: + from _pyyaml_pep517 import ActiveConfigSettings +@@ -325,8 +320,6 @@ def run(self): + 'build_ext': build_ext, + 'test': test, + } +-if bdist_wheel: +- cmdclass['bdist_wheel'] = bdist_wheel + + + if __name__ == '__main__': + +From bdc81567884bedab456f62ccfd3c1ec800c57e36 Mon Sep 17 00:00:00 2001 +From: Henry Schreiner +Date: Tue, 13 Aug 2024 09:50:19 -0400 +Subject: [PATCH 2/2] Update pyproject.toml + +--- + pyproject.toml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index d8e5b9695..00ce069c6 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,6 @@ + [build-system] + requires = [ + "setuptools", # FIXME: declare min/max setuptools versions? +- "wheel", + "Cython; python_version < '3.13'", + "Cython>=3.0; python_version >= '3.13'" + ] diff --git a/PyYAML.spec b/PyYAML.spec index 8cb2438..37b0c47 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,5 +1,5 @@ Name: PyYAML -Version: 6.0.3 +Version: 6.0.2 Release: %autorelease Summary: YAML parser and emitter for Python @@ -8,6 +8,9 @@ License: MIT URL: https://github.com/yaml/pyyaml Source: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz +# Drop unneeded build dependency on python3-wheel +Patch: https://github.com/yaml/pyyaml/pull/823.patch + BuildRequires: gcc BuildRequires: libyaml-devel BuildRequires: python3-devel diff --git a/sources b/sources index b7b81fd..2695170 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.0.3.tar.gz) = a0da43e32d127409ad61b11dc1d733b2e9c743977b3d72c05c81fc2ab183b40bc284452b0874dbeae1a736e1cd4a34f0df641ceefd5e9df38b3e53155fc5f633 +SHA512 (6.0.2.tar.gz) = c72665131296762521d9ae4fc1c8619946f46ea16ad98b6b8e995828f2cdbd1ed61741fc2d646753f71d95a352b36562a1302f0cb646d5705652cd24b2f10b16