.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,32 +1,29 @@
-# Python 2 removal, RHBZ#1775075
+%if 0%{?fedora} || 0%{?rhel} >= 8
-%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+%bcond_without python3
-%bcond_with     python2
 %else
-%bcond_without  python2
+%bcond_with python3
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %endif
 
 Name:           PyYAML
-Version:        5.4.1
+Version:        3.12
-Release:        6%{?dist}
+Release:        16%{?dist}
-%global uversion %{version}
 Summary:        YAML parser and emitter for Python
 
+Group:          Development/Libraries
 License:        MIT
-URL:            https://github.com/yaml/pyyaml
+URL:            http://pyyaml.org/
-Source0:        https://github.com/yaml/pyyaml/archive/%{uversion}.tar.gz
+Source0:        http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz
-
 BuildRequires:  gcc
-BuildRequires:  libyaml-devel
-
-%if %{with python2}
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
-%endif
+BuildRequires:  python2-Cython
-
+BuildRequires:  libyaml-devel
+%if %{with python3}
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-Cython
-
+%endif
 
 %global _description\
 YAML is a data serialization format designed for human readability and\
@@ -39,35 +36,43 @@ 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 python2-pyyaml
 Summary: %summary
-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}
+Obsoletes: PyYAML < %{version}-%{release}
 
 %description -n python2-pyyaml %_description
-%endif
 
-%package -n python3-pyyaml
+%if %{with python3}
-Summary:        %summary
+%package -n python3-PyYAML
-%py_provides    python3-yaml
+Summary: YAML parser and emitter for Python
-%py_provides    python3-PyYAML
+Group: Development/Libraries
-
+Provides: python3-yaml = %{version}-%{release}
-%description -n python3-pyyaml %_description
+Provides: python3-yaml%{?_isa} = %{version}-%{release}
+
+%description -n python3-PyYAML
+YAML is a data serialization format designed for human readability and
+interaction with scripting languages.  PyYAML is a YAML parser and
+emitter for Python.
+
+PyYAML features a complete YAML 1.1 parser, Unicode support, pickle
+support, capable extension API, and sensible error messages.  PyYAML
+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 persistance.
+%endif
 
 
 %prep
-%setup -q -n pyyaml-%{uversion}
+%setup -q -n %{name}-%{version}
 chmod a-x examples/yaml-highlight/yaml_hl.py
 
 # remove pre-generated file
@@ -75,170 +80,81 @@ rm -rf ext/_yaml.c
 
 
 %build
-%py3_build
+# regenerate ext/_yaml.c
-
+CFLAGS="${RPM_OPT_FLAGS}" %{__python2} setup.py --with-libyaml build_ext
-%if %{with python2}
+
-# py2_build reuses Cython output from py3_build
+%if %{with python3}
-%py2_build
+rm -rf %{py3dir}
+# ext/_yaml.c is needed
+cp -a . %{py3dir}
+pushd %{py3dir}
+CFLAGS="${RPM_OPT_FLAGS}" %{__python3} setup.py --with-libyaml build
+popd
 %endif
 
+CFLAGS="${RPM_OPT_FLAGS}" %{__python2} setup.py --with-libyaml build
+
 
 %install
-%if %{with python2}
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
-%py2_install
+
+%if %{with python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
+popd
 %endif
-%py3_install
 
 
 %check
-%if %{with python2}
 %{__python2} setup.py test
-%endif
+
+%if %{with python3}
+pushd %{py3dir}
 %{__python3} setup.py test
+popd
+%endif
 
 
-%if %{with python2}
 %files -n python2-pyyaml
+%{!?_licensedir:%global license %%doc}
 %license LICENSE
-%doc CHANGES README examples
+%doc CHANGES PKG-INFO README examples
 %{python2_sitearch}/*
-%endif
 
-%files -n python3-pyyaml
+%if %{with python3}
+%files -n python3-PyYAML
+%{!?_licensedir:%global license %%doc}
 %license LICENSE
-%doc CHANGES README examples
+%doc CHANGES PKG-INFO README examples
 %{python3_sitearch}/*
+%endif
 
 
 %changelog
-* Tue Feb 08 2022 Miro Hrončok <mhroncok@redhat.com> - 5.4.1-6
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.12-16
-- Remove some outdated Obsoletes and Provides,
+- Rebuilt for MSVSphere 8.8
-  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)
-
-* Thu Jan 14 2021 John Eckersberg <jeckersb@redhat.com> - 5.4-0.1.b1
-- New upstream beta release 5.4b1 (rhbz#1916034)
-
-* 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
+* Wed Apr 03 2019 Tomas Orsava <torsava@redhat.com> - 3.12-16
-- Rename python3-PyYAML to python3-pyyaml
+- Bumping due to problems with modular RPM upgrade path
-- Modernize spec
+- Resolves: rhbz#1695587
-- Fix python2 invocation
 
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-4
+* Tue Oct 09 2018 Lumír Balhar <lbalhar@redhat.com> - 3.12-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+- Remove unversioned provides
+- Resolves: rhbz#1628242
 
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 4.1-3
+* Fri Oct 05 2018 Lumír Balhar <lbalhar@redhat.com> - 3.12-14
-- Rebuilt for Python 3.7
+- Remove unversioned provides
+- Resolves: rhbz#1628242
 
-* Mon Jul 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.1-2
+* Tue Oct 02 2018 Lumír Balhar <lbalhar@redhat.com> - 3.12-13
-- Rebuilt for Python 3.7
+- Fix unversioned requires/buildrequires
+- Resolves: rhbz#1628242
 
-* Wed Jun 27 2018 John Eckersberg <eck@redhat.com> - 4.1-1
+* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 3.12-12
-- New upstream release 4.1
+- Switch python3 coditions to bcond
 
-* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 3.12-11
+* 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
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild