From d412c02d134d8f511e415f9921efd311f777c075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Tue, 9 Sep 2025 13:33:29 +0200 Subject: [PATCH] Convert from Fedora for the Python 3.14 stack in RHEL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fedora contributions by: Bill Nottingham Bohuslav Kabrda Charalampos Stratakis Dan Horák David Malcolm Dennis Gilmore Ignacio Vazquez-Abrams Igor Gnatenko Iryna Shcherbina Jakub Čajka Jesse Keating John Eckersberg Jonathan Wright Kalev Lember Karolina Surma Lukáš Zachar Lumir Balhar Mamoru Tasaka Miro Hrončok Peter Robinson Petr Viktorin Robert Kuska Štěpán Šigut Tom Callaway Troy Dawson Zbigniew Jędrzejewski-Szmek --- changelog | 305 ------------------ ...3.14-PyYAML.spec => python3.14-pyyaml.spec | 20 +- tests/smoke/main.fmf | 2 +- tests/smoke/runtest.sh | 2 +- 4 files changed, 10 insertions(+), 319 deletions(-) delete mode 100644 changelog rename python3.14-PyYAML.spec => python3.14-pyyaml.spec (79%) diff --git a/changelog b/changelog deleted file mode 100644 index bb0e538..0000000 --- a/changelog +++ /dev/null @@ -1,305 +0,0 @@ -* Fri Jul 28 2023 Miro Hrončok - 6.0.1-4 -- Fix build with Cython 3 - -* Tue Jul 25 2023 Miro Hrončok - 6.0.1-3 -- Pin Cython < 3 to build this package - -* Wed Jul 19 2023 Fedora Release Engineering - 6.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 18 2023 John Eckersberg - 6.0.1-1 -- New upstream release 6.0.1 (rhbz#2223462) - -* Tue Jun 13 2023 Python Maint - 6.0-8 -- Rebuilt for Python 3.12 - -* Tue Apr 11 2023 John Eckersberg - 6.0-7 -- Rebuilt for Python 3.12 / Cython 0.29.34 (rhbz#2177815) - -* Wed Jan 18 2023 Fedora Release Engineering - 6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 6.0-4 -- Rebuilt for Python 3.11 - -* Tue Feb 08 2022 Miro Hrončok - 6.0-3 -- Remove some outdated Obsoletes and Provides, - but keep providing python3-yaml and python3-PyYAML for users - -* Wed Jan 19 2022 Fedora Release Engineering - 6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Oct 13 2021 John Eckersberg - 6.0-1 -- New upstream release 6.0 - -* Mon Oct 4 2021 John Eckersberg - 6.0-0.1.b1 -- New upstream beta release 6.0b1 (rhbz#2010501) - -* Wed Jul 21 2021 Fedora Release Engineering - 5.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 02 2021 Python Maint - 5.4.1-3 -- Rebuilt for Python 3.10 - -* Mon Jan 25 2021 Fedora Release Engineering - 5.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 21 2021 John Eckersberg - 5.4.1-1 -- New upstream release 5.4.1 (rhbz#1918523) - -* Wed Jan 20 2021 John Eckersberg - 5.4-1 -- New upstream release 5.4 -- Fixes CVE-2020-14343 - -* Fri Jan 15 2021 John Eckersberg - 5.4-0.1.b2 -- New upstream beta release 5.4b2 (rhbz#1916496) - -* Thu Jan 14 2021 John Eckersberg - 5.4-0.1.b1 -- New upstream beta release 5.4b1 (rhbz#1916034) - -* Mon Nov 23 2020 Miro Hrončok - 5.3.1-5 -- Disable Python 2 build on RHEL 9+ - -* Mon Jul 27 2020 Fedora Release Engineering - 5.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri May 22 2020 Miro Hrončok - 5.3.1-3 -- Rebuilt for Python 3.9 - -* Mon May 18 2020 John Eckersberg - 5.3.1-2 -- Fix fedora conditional macro (rhbz#1836656) - -* Thu Mar 19 2020 John Eckersberg - 5.3.1-1 -- New upstream release 5.3.1 (rhbz#1814882) -- Fixes CVE-2020-1747 (rhbz#1807367,1809011) - -* Tue Mar 10 2020 Kalev Lember - 5.3-4 -- Add back PyYAML provides on F31 and older - -* Mon Mar 2 2020 John Eckersberg - 5.3-3 -- Fix python2 on Fedora < 32 (rhbz#1808812) - -* Tue Jan 28 2020 Fedora Release Engineering - 5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 6 2020 John Eckersberg - 5.3-1 -- New upstream release 5.3 - -* Tue Dec 3 2019 John Eckersberg - 5.2-1 -- New upstream release 5.2 - -* Fri Nov 22 2019 John Eckersberg - 5.1.2-4 -- Build without python2 by default (rhbz#1775075) - -* Thu Sep 19 2019 Miro Hrončok - 5.1.2-3 -- Stop providing PyYAML from python2-pyyaml, Python now means Python 3 - -* Thu Aug 15 2019 Miro Hrončok - 5.1.2-2 -- Rebuilt for Python 3.8 - -* Wed Jul 31 2019 John Eckersberg - 5.1.2-1 -- New upstream release 5.1.2 - -* Wed Jul 24 2019 Fedora Release Engineering - 5.1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 15 2019 Petr Viktorin - 5.1.1-2 -- Remove build dependency on python2-Cython - -* Fri Jun 7 2019 John Eckersberg - 5.1.1-1 -- New upstream release 5.1.1 (rhbz#1718110) - -* Wed Mar 13 2019 John Eckersberg - 5.1-1 -- New upstream release 5.1 (rhbz#1688414) -- Fixes CVE-2017-18342 (rhbz#1595744) - -* Fri Mar 8 2019 John Eckersberg - 5.1-0.1.b6 -- New upstream beta release 5.1b6 (rhbz#1686643) - -* Thu Feb 28 2019 John Eckersberg - 5.1-0.1.b3 -- New upstream beta release 5.1b3 (rhbz#1683884) - -* Mon Feb 25 2019 John Eckersberg - 5.1-0.1.b1 -- New upstream beta release 5.1b1 (rhbz#1680457) -- Typo fix (rhbz#1680463) - -* Thu Jan 31 2019 Fedora Release Engineering - 4.2-0.2.b4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 John Eckersberg - 4.2-0.1.b4 -- New upstream beta release 4.2b4 -- Replaces 4.1 which was retracted upstream - See https://mail.python.org/pipermail/python-announce-list/2018-June/011977.html -- Add BuildRequires for gcc - See https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot - -* Thu Jul 12 2018 Miro Hrončok - 4.1-5 -- Rename python3-PyYAML to python3-pyyaml -- Modernize spec -- Fix python2 invocation - -* Thu Jul 12 2018 Fedora Release Engineering - 4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Miro Hrončok - 4.1-3 -- Rebuilt for Python 3.7 - -* Mon Jul 02 2018 Igor Gnatenko - 4.1-2 -- Rebuilt for Python 3.7 - -* Wed Jun 27 2018 John Eckersberg - 4.1-1 -- New upstream release 4.1 - -* Fri Jun 15 2018 Miro Hrončok - 3.12-11 -- Rebuilt for Python 3.7 - -* Wed Feb 07 2018 Fedora Release Engineering - 3.12-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Dec 11 2017 Iryna Shcherbina - 3.12-9 -- Fix ambiguous Python 2 dependency declarations - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Sep 27 2017 Troy Dawson - 3.12-8 -- Cleanup spec file conditionals - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 3.12-7 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.12-6 -- Python 2 binary package renamed to python2-pyyaml - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Wed Aug 02 2017 Fedora Release Engineering - 3.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 3.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 12 2016 Charalampos Stratakis - 3.12-2 -- Rebuild for Python 3.6 - -* Mon Aug 29 2016 John Eckersberg - 3.12-1 -- New upstream release 3.12 (RHBZ#1371150) - -* Tue Jul 19 2016 Fedora Release Engineering - 3.11-13 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Feb 03 2016 Fedora Release Engineering - 3.11-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Dec 8 2015 John Eckersberg - 3.11-11 -- Add provides for python3-yaml (RHBZ#1288807) - -* Tue Nov 03 2015 Robert Kuska - 3.11-10 -- Rebuilt for Python3.5 rebuild - -* Fri Jul 17 2015 John Eckersberg - 3.11-9 -- Add provides for python2-yaml (RHBZ#1241678) - -* Tue Jun 16 2015 Fedora Release Engineering - 3.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 23 2015 John Eckersberg - 3.11-7 -- Add patch for CVE-2014-9130 (bug 1204829) - -* Mon Sep 15 2014 Jakub Čajka - 3.11-6 -- fixed typecast issues using debian patch(int->size_t)(BZ#1140189) -- spec file cleanup - -* Fri Aug 15 2014 Fedora Release Engineering - 3.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Aug 4 2014 Tom Callaway - 3.11-4 -- fix license handling - -* Fri Jun 06 2014 Fedora Release Engineering - 3.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 14 2014 Bohuslav Kabrda - 3.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 - -* Mon Apr 21 2014 John Eckersberg - 3.11-1 -- New upstream release 3.11 (BZ#1081521) - -* Thu Aug 8 2013 John Eckersberg - 3.10-9 -- Add check section and run test suite - -* Fri Aug 02 2013 Fedora Release Engineering - 3.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 3.10-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Aug 04 2012 David Malcolm - 3.10-6 -- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 - -* Wed Aug 1 2012 David Malcolm - 3.10-5 -- remove rhel logic from with_python3 conditional - -* Wed Jul 18 2012 Fedora Release Engineering - 3.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Apr 27 2012 John Eckersberg - 3.10-3 -- Add Provides for python-yaml (BZ#740390) - -* Thu Jan 12 2012 Fedora Release Engineering - 3.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Jun 23 2011 John Eckersberg - 3.10-1 -- New upstream release 3.10 - -* Mon Feb 07 2011 Fedora Release Engineering - 3.09-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Feb 2 2011 John Eckersberg - 3.09-7 -- Add support to build for python 3 - -* Tue Jul 27 2010 Mamoru Tasaka - 3.09-6 -- Bump release number for upgrade path - -* Wed Jul 21 2010 David Malcolm - 3.09-3 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Fri Oct 02 2009 John Eckersberg - 3.09-1 -- New upstream release 3.09 - -* Fri Jul 24 2009 Fedora Release Engineering - 3.08-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 22 2009 - John Eckersberg - 3.08-5 -- Minor tweaks to spec file aligning with latest Fedora packaging guidelines -- Enforce inclusion of libyaml in build with --with-libyaml option to setup.py -- Deliver to %%{python_sitearch} instead of %%{python_sitelib} due to _yaml.so -- Thanks to Gareth Armstrong - -* Tue Mar 3 2009 John Eckersberg - 3.08-4 -- Correction, change libyaml to libyaml-devel in BuildRequires - -* Mon Mar 2 2009 John Eckersberg - 3.08-3 -- Add libyaml to BuildRequires - -* Mon Feb 23 2009 Fedora Release Engineering - 3.08-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 18 2009 John Eckersberg - 3.08-1 -- New upstream release - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 3.06-2 -- Rebuild for Python 2.6 - -* Fri Oct 24 2008 John Eckersberg - 3.06-1 -- New upstream release - -* Wed Jan 02 2008 John Eckersberg - 3.05-2 -- Remove explicit dependency on python >= 2.3 -- Remove executable on example script in docs - -* Mon Dec 17 2007 John Eckersberg - 3.05-1 -- Initial packaging for Fedora diff --git a/python3.14-PyYAML.spec b/python3.14-pyyaml.spec similarity index 79% rename from python3.14-PyYAML.spec rename to python3.14-pyyaml.spec index 37b0c47..be75395 100644 --- a/python3.14-PyYAML.spec +++ b/python3.14-pyyaml.spec @@ -1,4 +1,6 @@ -Name: PyYAML +%global python3_pkgversion 3.14 + +Name: python%{python3_pkgversion}-pyyaml Version: 6.0.2 Release: %autorelease Summary: YAML parser and emitter for Python @@ -13,9 +15,11 @@ Patch: https://github.com/yaml/pyyaml/pull/823.patch BuildRequires: gcc BuildRequires: libyaml-devel -BuildRequires: python3-devel -BuildRequires: python3-pytest +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-pytest +%py_provides python%{python3_pkgversion}-yaml +%py_provides python%{python3_pkgversion}-PyYAML %global _description\ YAML is a data serialization format designed for human readability and\ @@ -33,14 +37,6 @@ configuration files to object serialization and persistence. %description %_description -%package -n python3-pyyaml -Summary: %summary -%py_provides python3-yaml -%py_provides python3-PyYAML - -%description -n python3-pyyaml %_description - - %prep %autosetup -p1 -n pyyaml-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py @@ -66,7 +62,7 @@ rm -rf ext/_yaml.c %pytest -%files -n python3-pyyaml -f %{pyproject_files} +%files -n python%{python3_pkgversion}-pyyaml -f %{pyproject_files} %doc CHANGES README.md examples diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf index 7d9c513..dd643ec 100644 --- a/tests/smoke/main.fmf +++ b/tests/smoke/main.fmf @@ -1,5 +1,5 @@ test: ./runtest.sh framework: beakerlib require: - - python3-pyyaml + - python3.14-pyyaml duration: 5m diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh index 72451ed..1c4f6b9 100755 --- a/tests/smoke/runtest.sh +++ b/tests/smoke/runtest.sh @@ -28,7 +28,7 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 -PYTHON=${PYTHON:-"python3"} +PYTHON=${PYTHON:-"python3.14"} PATTERN1="{'name': 'foo'} {'name': 'bar'}