.PyYAML.metadata

@@ -1 +1 @@
-efbe83434843c1963a9e56f36a9afa74a38c60a8 SOURCES/5.4.1.tar.gz
+cb7fd3e58c129494ee86e41baedfec69eb7dafbe SOURCES/PyYAML-3.12.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/5.4.1.tar.gz
+SOURCES/PyYAML-3.12.tar.gz

SPECS/PyYAML.spec

@@ -1,33 +1,18 @@
-# RHEL8: disable building python2 in the python39 module
+%global _name pyyaml
-%bcond_with     python2
-
 Name:           PyYAML
-Version:        5.4.1
+Version:        3.12
-Release:        1%{?dist}
+Release:        12%{?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#/%{name}-%{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
 
-%if %{with python2}
+BuildRequires:  python3-devel
-BuildRequires:  python2-devel
+BuildRequires:  python3-setuptools
-BuildRequires:  python2-setuptools
+BuildRequires:  python3-Cython
-%endif
-
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
-BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-Cython
 
 
 %global _description\
@@ -41,38 +26,26 @@ supports standard YAML tags and provides Python-specific tags that\
 allow to represent an arbitrary Python object.\
 \
 PyYAML is applicable for a broad range of tasks from complex\
-configuration files to object serialization and persistence.
+configuration files to object serialization and persistance.
 
 %description %_description
 
 
-%if %{with python2}
+%package -n python3-pyyaml
-%package -n python2-pyyaml
 Summary:        %summary
-Provides:       python-yaml = %{version}-%{release}
+Provides:       python3-yaml = %{version}-%{release}
-Provides:       python-yaml%{?_isa} = %{version}-%{release}
+Provides:       python3-yaml%{?_isa} = %{version}-%{release}
-Provides:       python2-yaml = %{version}-%{release}
+%{?python_provide:%python_provide python3-pyyaml}
-Provides:       python2-yaml%{?_isa} = %{version}-%{release}
+# Remove before F31
-Provides:       PyYAML = %{version}-%{release}
+Provides:       python3-PyYAML = %{version}-%{release}
-Provides:       PyYAML%{?_isa} = %{version}-%{release}
+Provides:       python3-PyYAML%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-pyyaml}
+Obsoletes:      python3-PyYAML < 3.12-12
 
-%description -n python2-pyyaml %_description
+%description -n python3-pyyaml %_description
-%endif
-
-%package -n python%{python3_pkgversion}-pyyaml
-Summary:        %summary
-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 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
@@ -82,143 +55,35 @@ rm -rf ext/_yaml.c
 %build
 %py3_build
 
-%if %{with python2}
-# py2_build reuses Cython output from py3_build
-%py2_build
-%endif
-
 
 %install
-%if %{with python2}
-%py2_install
-%endif
 %py3_install
 
 
 %check
-%if %{with python2}
-%{__python2} setup.py test
-%endif
 %{__python3} setup.py test
 
 
-%if %{with python2}
+%files -n python3-pyyaml
-%files -n python2-pyyaml
 %license LICENSE
-%doc CHANGES README examples
+%doc CHANGES PKG-INFO README examples
-%{python2_sitearch}/*
-%endif
-
-%files -n python%{python3_pkgversion}-pyyaml
-%license LICENSE
-%doc CHANGES README examples
 %{python3_sitearch}/*
 
 
 %changelog
-* Tue Mar 23 2021 Tomas Orsava <torsava@redhat.com> - 5.4.1-1
+* Fri Jul 13 2018 Petr Viktorin <pviktori@redhat.com> - 3.12-13
-- Rebase to version 5.4.1 to fix CVE-2020-14343
+- Remove the Python 2 subpackage
-- Resolves: rhbz#1860466
+  https://bugzilla.redhat.com/show_bug.cgi?id=1590281
 
-* Mon Jan 18 2021 Tomas Orsava <torsava@redhat.com> - 5.3.1-6
+* Thu Jul 12 2018 Miro Hrončok <mhroncok@redhat.com> - 3.12-12
-- 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+
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 5.3.1-3
-- Rebuilt for Python 3.9
-
-* Mon May 18 2020 John Eckersberg <eck@redhat.com> - 5.3.1-2
-- Fix fedora conditional macro (rhbz#1836656)
-
-* Thu Mar 19 2020 John Eckersberg <eck@redhat.com> - 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 <klember@redhat.com> - 5.3-4
-- Add back PyYAML provides on F31 and older
-
-* Mon Mar  2 2020 John Eckersberg <eck@redhat.com> - 5.3-3
-- Fix python2 on Fedora < 32 (rhbz#1808812)
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan  6 2020 John Eckersberg <eck@redhat.com> - 5.3-1
-- New upstream release 5.3
-
-* Tue Dec  3 2019 John Eckersberg <eck@redhat.com> - 5.2-1
-- New upstream release 5.2
-
-* Fri Nov 22 2019 John Eckersberg <eck@redhat.com> - 5.1.2-4
-- Build without python2 by default (rhbz#1775075)
-
-* Thu Sep 19 2019 Miro Hrončok <mhroncok@redhat.com> - 5.1.2-3
-- Stop providing PyYAML from python2-pyyaml, Python now means Python 3
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 5.1.2-2
-- Rebuilt for Python 3.8
-
-* Wed Jul 31 2019 John Eckersberg <eck@redhat.com> - 5.1.2-1
-- New upstream release 5.1.2
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jul 15 2019 Petr Viktorin <pviktori@redhat.com> - 5.1.1-2
-- Remove build dependency on python2-Cython
-
-* Fri Jun  7 2019 John Eckersberg <eck@redhat.com> - 5.1.1-1
-- New upstream release 5.1.1 (rhbz#1718110)
-
-* Wed Mar 13 2019 John Eckersberg <eck@redhat.com> - 5.1-1
-- New upstream release 5.1 (rhbz#1688414)
-- Fixes CVE-2017-18342 (rhbz#1595744)
-
-* Fri Mar  8 2019 John Eckersberg <eck@redhat.com> - 5.1-0.1.b6
-- New upstream beta release 5.1b6 (rhbz#1686643)
-
-* Thu Feb 28 2019 John Eckersberg <eck@redhat.com> - 5.1-0.1.b3
-- New upstream beta release 5.1b3 (rhbz#1683884)
-
-* Mon Feb 25 2019 John Eckersberg <eck@redhat.com> - 5.1-0.1.b1
-- New upstream beta release 5.1b1 (rhbz#1680457)
-- Typo fix (rhbz#1680463)
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2-0.2.b4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 John Eckersberg <eck@redhat.com> - 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 <mhroncok@redhat.com> - 4.1-5
 - Rename python3-PyYAML to python3-pyyaml
 - Modernize spec
 - Fix python2 invocation
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-4
+- Cherry-picked from: https://src.fedoraproject.org/rpms/PyYAML/pull-request/2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 4.1-3
+* Mon Jun 25 2018 Tomas Orsava <torsava@redhat.com> - 3.12-11
-- Rebuilt for Python 3.7
+- Use python2 macros instead of unversioned python macros
-
-* Mon Jul 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.1-2
-- Rebuilt for Python 3.7
-
-* Wed Jun 27 2018 John Eckersberg <eck@redhat.com> - 4.1-1
-- New upstream release 4.1
-
-* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 3.12-11
-- Rebuilt for Python 3.7
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild