SPECS/PyYAML.spec

@@ -1,13 +1,9 @@
-# Python 2 removal, RHBZ#1775075
-%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+# RHEL8: disable building python2 in the python39 module
 %bcond_with     python2
-%else
-%bcond_without  python2
-%endif
 
 Name:           PyYAML
 Version:        5.4.1
-Release:        6%{?dist}
+Release:        1%{?dist}
 %global uversion %{version}
 Summary:        YAML parser and emitter for Python
 
@@ -15,6 +11,11 @@ License:        MIT
 URL:            https://github.com/yaml/pyyaml
 Source0:        https://github.com/yaml/pyyaml/archive/%{uversion}.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 +24,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}-rpm-macros
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-Cython
 
 
 %global _description\
@@ -58,12 +60,15 @@ Provides:       PyYAML%{?_isa} = %{version}-%{release}
 %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}
+%{?python_provide:%python_provide python%{python3_pkgversion}-pyyaml}
+Provides:       python%{python3_pkgversion}-PyYAML = %{version}-%{release}
+Provides:       python%{python3_pkgversion}-PyYAML%{?_isa} = %{version}-%{release}
 
-%description -n python3-pyyaml %_description
+%description -n python%{python3_pkgversion}-pyyaml %_description
 
 
 %prep
@@ -104,45 +109,20 @@ 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 <mhroncok@redhat.com> - 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 <torsava@redhat.com> - 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 <mboddu@redhat.com> - 5.4.1-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 5.4.1-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Jan 21 2021 John Eckersberg <jeckersb@redhat.com> - 5.4.1-1
-- New upstream release 5.4.1 (rhbz#1918523)
-
-* Wed Jan 20 2021 John Eckersberg <jeckersb@redhat.com> - 5.4-1
-- New upstream release 5.4
-- Fixes CVE-2020-14343
-
-* Fri Jan 15 2021 John Eckersberg <jeckersb@redhat.com> - 5.4-0.1.b2
-- New upstream beta release 5.4b2 (rhbz#1916496)
+* Tue Mar 23 2021 Tomas Orsava <torsava@redhat.com> - 5.4.1-1
+- Rebase to version 5.4.1 to fix CVE-2020-14343
+- Resolves: rhbz#1860466
 
-* Thu Jan 14 2021 John Eckersberg <jeckersb@redhat.com> - 5.4-0.1.b1
-- New upstream beta release 5.4b1 (rhbz#1916034)
+* Mon Jan 18 2021 Tomas Orsava <torsava@redhat.com> - 5.3.1-6
+- Add PyYAML to the python39 module in RHEL8
+- Resolves: rhbz#1877430
 
 * Mon Nov 23 2020 Miro Hrončok <mhroncok@redhat.com> - 5.3.1-5
 - Disable Python 2 build on RHEL 9+