diff --git a/.PyYAML.metadata b/.PyYAML.metadata index 25165c3..8edfec7 100644 --- a/.PyYAML.metadata +++ b/.PyYAML.metadata @@ -1 +1 @@ -efbe83434843c1963a9e56f36a9afa74a38c60a8 SOURCES/5.4.1.tar.gz +0357ea5191350eb286edd91da45b90c40941fc21 SOURCES/5.4.1.tar.gz diff --git a/SPECS/PyYAML.spec b/SPECS/PyYAML.spec index 59545a4..e131aa1 100644 --- a/SPECS/PyYAML.spec +++ b/SPECS/PyYAML.spec @@ -1,19 +1,21 @@ -# Python 2 removal, RHBZ#1775075 -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 -%bcond_with python2 -%else -%bcond_without python2 -%endif - +# Prepared for Python 2 removal +%bcond_with python2 +%{!?python3_pkgversion: %global python3_pkgversion 3} +%global python3_other_pkgversion %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))") Name: PyYAML Version: 5.4.1 -Release: 6%{?dist} +Release: 1.0.1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python License: MIT URL: https://github.com/yaml/pyyaml -Source0: https://github.com/yaml/pyyaml/archive/%{uversion}.tar.gz +Source0: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz + +# Exclude i686 arch. Due to a modularity issue it's being added to the +# x86_64 compose of CRB, but we don't want to ship it at all. +# See: https://projects.engineering.redhat.com/browse/RCM-72605 +ExcludeArch: i686 BuildRequires: gcc BuildRequires: libyaml-devel @@ -23,9 +25,10 @@ BuildRequires: python2-devel BuildRequires: python2-setuptools %endif -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-Cython +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-Cython +BuildRequires: python%{python3_pkgversion}-rpm-macros %global _description\ @@ -51,23 +54,29 @@ Provides: python-yaml = %{version}-%{release} Provides: python-yaml%{?_isa} = %{version}-%{release} Provides: python2-yaml = %{version}-%{release} Provides: python2-yaml%{?_isa} = %{version}-%{release} -Provides: PyYAML = %{version}-%{release} -Provides: PyYAML%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python2-pyyaml} %description -n python2-pyyaml %_description %endif -%package -n python3-pyyaml +%package -n python%{python3_pkgversion}-pyyaml Summary: %summary -%py_provides python3-yaml -%py_provides python3-PyYAML +Provides: python%{python3_pkgversion}-yaml = %{version}-%{release} +Provides: python%{python3_pkgversion}-yaml%{?_isa} = %{version}-%{release} +Provides: python%{python3_pkgversion}-PyYAML = %{version}-%{release} +Provides: python%{python3_pkgversion}-PyYAML%{?_isa} = %{version}-%{release} +Provides: python%{python3_other_pkgversion}-pyyaml = %{version}-%{release} +Provides: python%{python3_other_pkgversion}-pyyaml%{?_isa} = %{version}-%{release} +Provides: python%{python3_other_pkgversion}-PyYAML = %{version}-%{release} +Provides: python%{python3_other_pkgversion}-PyYAML%{?_isa} = %{version}-%{release} +Provides: python%{python3_other_pkgversion}-yaml = %{version}-%{release} +Provides: python%{python3_other_pkgversion}-yaml%{?_isa} = %{version}-%{release} -%description -n python3-pyyaml %_description +%description -n python%{python3_pkgversion}-pyyaml %_description %prep -%setup -q -n pyyaml-%{uversion} +%setup -q -n %{name}-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -104,57 +113,15 @@ rm -rf ext/_yaml.c %{python2_sitearch}/* %endif -%files -n python3-pyyaml +%files -n python%{python3_pkgversion}-pyyaml %license LICENSE %doc CHANGES README examples %{python3_sitearch}/* %changelog -* Tue Feb 08 2022 Miro Hrončok - 5.4.1-6 -- Remove some outdated Obsoletes and Provides, - but keep providing python3-yaml and python3-PyYAML for users -- Related: rhbz#1990421 - -* Tue Feb 08 2022 Tomas Orsava - 5.4.1-5 -- Add automatically generated Obsoletes tag with the python39- prefix - for smoother upgrade from RHEL8 -- Related: rhbz#1990421 - -* Tue Aug 10 2021 Mohan Boddu - 5.4.1-4 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 - -* Thu Apr 15 2021 Mohan Boddu - 5.4.1-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - -* 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) +* Wed Nov 13 2024 Eduard Basov - 5.4.1-1.0.1 +- Rebuild for MSVSphere * Thu Mar 19 2020 John Eckersberg - 5.3.1-1 - New upstream release 5.3.1 (rhbz#1814882) @@ -169,14 +136,14 @@ rm -rf ext/_yaml.c * 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 +* Fri Dec 13 2019 Tomas Orsava - 5.1.2-6 +- Exclude unsupported i686 arch -* Tue Dec 3 2019 John Eckersberg - 5.2-1 -- New upstream release 5.2 +* Fri Nov 22 2019 Lumír Balhar - 5.1.2-5 +- Removed unwanted Obsoletes -* Fri Nov 22 2019 John Eckersberg - 5.1.2-4 -- Build without python2 by default (rhbz#1775075) +* Wed Nov 20 2019 Lumír Balhar - 5.1.2-4 +- Adjusted for Python 3.8 module in RHEL 8 * Thu Sep 19 2019 Miro Hrončok - 5.1.2-3 - Stop providing PyYAML from python2-pyyaml, Python now means Python 3