From 205a18bf0c9ac2f5b68db61024be7e94df836c66 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Jan 2008 18:21:24 +0000 Subject: [PATCH 001/153] Initialize branch F-7 for PyYAML --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 74ec1ce5d03a2ac05f8f1e2764e3c3556ef93c7a Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 7 Jan 2008 18:44:23 +0000 Subject: [PATCH 002/153] initial import from srpm --- .cvsignore | 1 + PyYAML.spec | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 63 insertions(+) create mode 100644 PyYAML.spec diff --git a/.cvsignore b/.cvsignore index e69de29..d2dd16c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +PyYAML-3.05.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec new file mode 100644 index 0000000..4d03628 --- /dev/null +++ b/PyYAML.spec @@ -0,0 +1,61 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Name: PyYAML +Version: 3.05 +Release: 2%{?dist} +Summary: YAML parser and emitter for Python + +Group: Development/Libraries +License: MIT +URL: http://pyyaml.org/ +Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: python-devel, python-setuptools + +%description +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. + +%prep +%setup -q -n %{name}-%{version} + + +%build +%{__python} setup.py build +chmod a-x examples/yaml-highlight/yaml_hl.py + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{_bindir} +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc PKG-INFO README LICENSE examples +%{python_sitelib}/* + + +%changelog +* 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/sources b/sources index e69de29..3b9e36b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +04ebb924a571cfb26d8143069068ce86 PyYAML-3.05.tar.gz From 0e635d4dd1eb021daa5a8dada9696933d001bd94 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Sun, 13 Jan 2008 19:50:44 +0000 Subject: [PATCH 003/153] initial import into F-7 --- .cvsignore | 1 + PyYAML.spec | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 63 insertions(+) create mode 100644 PyYAML.spec diff --git a/.cvsignore b/.cvsignore index e69de29..d2dd16c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +PyYAML-3.05.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec new file mode 100644 index 0000000..4d03628 --- /dev/null +++ b/PyYAML.spec @@ -0,0 +1,61 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + +Name: PyYAML +Version: 3.05 +Release: 2%{?dist} +Summary: YAML parser and emitter for Python + +Group: Development/Libraries +License: MIT +URL: http://pyyaml.org/ +Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: python-devel, python-setuptools + +%description +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. + +%prep +%setup -q -n %{name}-%{version} + + +%build +%{__python} setup.py build +chmod a-x examples/yaml-highlight/yaml_hl.py + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{_bindir} +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc PKG-INFO README LICENSE examples +%{python_sitelib}/* + + +%changelog +* 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/sources b/sources index e69de29..3b9e36b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +04ebb924a571cfb26d8143069068ce86 PyYAML-3.05.tar.gz From b8e0d83c211ec4f731c85b5a544aacf8466119e4 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 24 Oct 2008 17:30:42 +0000 Subject: [PATCH 004/153] New upstream version 3.06 --- .cvsignore | 2 +- PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d2dd16c..520c1fd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -PyYAML-3.05.tar.gz +PyYAML-3.06.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 4d03628..26b86b0 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: PyYAML -Version: 3.05 -Release: 2%{?dist} +Version: 3.06 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 diff --git a/sources b/sources index 3b9e36b..d97f5d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04ebb924a571cfb26d8143069068ce86 PyYAML-3.05.tar.gz +3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz From 155c9ea0657f6717d9d63cf0145b18ec7fbed91f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 27 Oct 2008 04:48:02 +0000 Subject: [PATCH 005/153] Initialize branch EL-4 for PyYAML --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From f6384943bcb7951284b6f70e134f9ed34e6f342d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 27 Oct 2008 04:48:03 +0000 Subject: [PATCH 006/153] Initialize branch EL-5 for PyYAML --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 5b4754b297c4abb8e26b77f1822a33f12d5765a3 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 17:46:54 +0000 Subject: [PATCH 007/153] Rebuild for Python 2.6 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 26b86b0..b58d4c9 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.06 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From b3ea60d0f0562be966b1c3158577154c6280d51b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 18 Feb 2009 19:45:37 +0000 Subject: [PATCH 008/153] Upload newest upstream 3.08 --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index 520c1fd..a9b5195 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ PyYAML-3.06.tar.gz +PyYAML-3.08.tar.gz diff --git a/sources b/sources index d97f5d5..b61c036 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz +a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From 7a85b8d15f1e6e3bdccd00474a00a1a04cc05c00 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 18 Feb 2009 20:11:35 +0000 Subject: [PATCH 009/153] - Update to 3.08 release - Don't build noarch (see: https://www.redhat.com/archives/fedora-devel-list/2007-November/msg0142 7.html) --- PyYAML.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index b58d4c9..7061b4a 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,8 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyYAML -Version: 3.06 -Release: 2%{?dist} +Version: 3.08 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,6 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch BuildRequires: python-devel, python-setuptools %description @@ -53,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 94d52e0d04bbc51c1675ba985669deabab048647 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 23 Feb 2009 22:40:03 +0000 Subject: [PATCH 010/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7061b4a..dd89eea 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From ffab6384b19e90ada5e905aa2bd0594993bb85af Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 27 Feb 2009 02:19:28 +0000 Subject: [PATCH 011/153] remove old sources entry --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index b61c036..084d250 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From e452fffddcb2350ab43e5d625b26f48ec93f90d3 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 3 Mar 2009 00:55:40 +0000 Subject: [PATCH 012/153] Add libyaml to BuildRequires --- PyYAML.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index dd89eea..e374219 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,7 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, python-setuptools +BuildRequires: python-devel, python-setuptools, libyaml %description YAML is a data serialization format designed for human readability and @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 3a057b6195b1ac5fc8627930fd42b851bd5f5d5d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 3 Mar 2009 18:13:47 +0000 Subject: [PATCH 013/153] fix buildrequires s/libyaml/libyaml-devel/ --- PyYAML.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index e374219..f93697b 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ Name: PyYAML Version: 3.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,7 +11,7 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-devel, python-setuptools, libyaml +BuildRequires: python-devel, python-setuptools, libyaml-devel %description YAML is a data serialization format designed for human readability and @@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From a110c9dc50313cd7460309514ee1b2a4369d383d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 4 Mar 2009 17:45:38 +0000 Subject: [PATCH 014/153] copy spec over from devel and remove old sources line --- PyYAML.spec | 24 +++++++++++++++++++----- sources | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 26b86b0..f93697b 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,8 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyYAML -Version: 3.06 -Release: 1%{?dist} +Version: 3.08 +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,8 +11,7 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: python-devel, python-setuptools +BuildRequires: python-devel, python-setuptools, libyaml-devel %description YAML is a data serialization format designed for human readability and @@ -53,6 +52,21 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 diff --git a/sources b/sources index d97f5d5..084d250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz +a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From edc28aa0ca5914b68ff915744b57c7fb2868bf22 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 4 Mar 2009 17:55:55 +0000 Subject: [PATCH 015/153] copy spec over from devel and remove old sources line --- PyYAML.spec | 24 +++++++++++++++++++----- sources | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 26b86b0..f93697b 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,8 +1,8 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: PyYAML -Version: 3.06 -Release: 1%{?dist} +Version: 3.08 +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -11,8 +11,7 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: python-devel, python-setuptools +BuildRequires: python-devel, python-setuptools, libyaml-devel %description YAML is a data serialization format designed for human readability and @@ -53,6 +52,21 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 diff --git a/sources b/sources index d97f5d5..084d250 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d3c92528f1547756c9e1d80d7d905c7 PyYAML-3.06.tar.gz +a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz From 78db20dc553f0f8969459ec05d6f00fc2c952a3b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 22 Jul 2009 18:49:39 +0000 Subject: [PATCH 016/153] - 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 --- PyYAML.spec | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index f93697b..9572405 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,15 +1,17 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +#====================================================================# Name: PyYAML Version: 3.08 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python-devel, python-setuptools, libyaml-devel @@ -20,38 +22,43 @@ 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. +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. %prep %setup -q -n %{name}-%{version} - - -%build -%{__python} setup.py build chmod a-x examples/yaml-highlight/yaml_hl.py +%build +CFLAGS="${RPM_OPT_FLAGS}" %{__python} setup.py --with-libyaml build + + %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +rm -rf %{buildroot} +%{__python} setup.py install -O1 --skip-build --root %{buildroot} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc PKG-INFO README LICENSE examples -%{python_sitelib}/* +%doc CHANGES LICENSE PKG-INFO README examples +%{python_sitearch}/* %changelog +* 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 From bbb12f2735210e888ec56cf5eed4c88ee3c6925e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:05:06 +0000 Subject: [PATCH 017/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 9572405..3badd51 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.08 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* 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 From 92400218667e8fa38e197c9658d38ba0e2744a5e Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 2 Oct 2009 14:03:30 +0000 Subject: [PATCH 018/153] New upstream release 3.09 --- .cvsignore | 3 +-- PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index a9b5195..89555f4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -PyYAML-3.06.tar.gz -PyYAML-3.08.tar.gz +PyYAML-3.09.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 3badd51..8b6ce82 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -3,8 +3,8 @@ #====================================================================# Name: PyYAML -Version: 3.08 -Release: 6%{?dist} +Version: 3.09 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* 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 diff --git a/sources b/sources index 084d250..c484ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz +f219af2361e87fdc5e85e95b84c11d87 PyYAML-3.09.tar.gz From 9dd8d8620b768c12460a7a49d7e4be4363b00a1b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 2 Oct 2009 14:16:34 +0000 Subject: [PATCH 019/153] New upstream release 3.09 --- PyYAML.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 3badd51..8b6ce82 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -3,8 +3,8 @@ #====================================================================# Name: PyYAML -Version: 3.08 -Release: 6%{?dist} +Version: 3.09 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* 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 diff --git a/sources b/sources index 084d250..c484ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4163a2017fa57f448c66815511fa555 PyYAML-3.08.tar.gz +f219af2361e87fdc5e85e95b84c11d87 PyYAML-3.09.tar.gz From 677cf61c30822dff419d40c58a2be64a83ed3eb9 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 24 Nov 2009 19:46:22 +0000 Subject: [PATCH 020/153] bump spec --- PyYAML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 8b6ce82..45c3595 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries From 3266f9662e46024002ba004332ee89fc6ca5a1f4 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 24 Nov 2009 20:13:58 +0000 Subject: [PATCH 021/153] bump spec --- PyYAML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 8b6ce82..45c3595 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries From ebc146f30fc38e3613e7f055d1b418f65064d6eb Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 25 Nov 2009 13:24:29 +0000 Subject: [PATCH 022/153] bump spec for rebuild against libyaml --- PyYAML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 45c3595..1c11a40 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries From 0a861404072a6de53783002ea8ebaf18713360b6 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:32:05 +0000 Subject: [PATCH 023/153] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df5dee3..a0a01e5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := PyYAML SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a145d80e114dd3cb9c8420791adf929d8f51edb0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:20:54 +0000 Subject: [PATCH 024/153] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df5dee3..a0a01e5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := PyYAML SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 64fcf7855757e47c6865c765dae63656692cafe7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:20:54 +0000 Subject: [PATCH 025/153] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df5dee3..a0a01e5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := PyYAML SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 065c5c9cbc6d214de0cda56e7e5814a8684cd0ce Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:20:54 +0000 Subject: [PATCH 026/153] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df5dee3..a0a01e5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := PyYAML SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From f6ddc0af6125f73461ee840ec51789ecf4edee1d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 00:20:54 +0000 Subject: [PATCH 027/153] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index df5dee3..a0a01e5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := PyYAML SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From c71fa219772cd2e1340e78b592098b7cd7058aeb Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 30 Nov 2009 16:45:46 +0000 Subject: [PATCH 028/153] Bump spec for libyaml-0.1.3 rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 1c11a40..fcfc779 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 30 2009 John Eckersberg - 3.09-4 +- Rebuild with libyaml-0.1.3 + * Fri Oct 02 2009 John Eckersberg - 3.09-1 - New upstream release 3.09 From 3a17f5cc09d2fd36f511fec348ffa83bc747a57c Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 30 Nov 2009 18:32:34 +0000 Subject: [PATCH 029/153] bump spec --- PyYAML.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index fcfc779..44a5554 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,7 +53,7 @@ rm -rf %{buildroot} %changelog -* Mon Nov 30 2009 John Eckersberg - 3.09-4 +* Mon Nov 30 2009 John Eckersberg - 3.09-5 - Rebuild with libyaml-0.1.3 * Fri Oct 02 2009 John Eckersberg - 3.09-1 From 4602e50c92bb166803ff7fa2cd39c548615d5c0b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:47:52 +0000 Subject: [PATCH 030/153] Initialize branch F-13 for PyYAML --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From c616a14878b9822e5bb32d8bb2fc6176c74782b8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:41:43 +0000 Subject: [PATCH 031/153] Initialize branch EL-6 for PyYAML --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From e328a87a322d2c5669640aac7fe627f1e092587b Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 19 May 2010 17:17:02 +0000 Subject: [PATCH 032/153] Fix NVR upgrade issues: greater for f12: PyYAML (jeckersb) f12 = PyYAML-3.09-5.fc12.src f13 = PyYAML-3.09-2.fc13.src --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 45c3595..44a5554 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 2%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Mon Nov 30 2009 John Eckersberg - 3.09-5 +- Rebuild with libyaml-0.1.3 + * Fri Oct 02 2009 John Eckersberg - 3.09-1 - New upstream release 3.09 From 24544973e06ce7786841bfc46e0ea38b07ada042 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 00:28:58 +0000 Subject: [PATCH 033/153] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 45c3595..7a60da3 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* 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 From 9c0bf5e8e65be00e7664d73d465bc0a78445f7e2 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 27 Jul 2010 09:38:37 +0000 Subject: [PATCH 034/153] - Bump release number for upgrade path --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7a60da3..51730a2 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 3%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,6 +53,9 @@ rm -rf %{buildroot} %changelog +* Tue Jul 27 2010 Mamoru Tasaka - 3.09-5 +- 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 From b2d86cc5084d8216eeb4cf714d8955dec44f1582 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 27 Jul 2010 09:43:33 +0000 Subject: [PATCH 035/153] Oops... build target wrong --- PyYAML.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 51730a2..c9dacea 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -4,7 +4,7 @@ Name: PyYAML Version: 3.09 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -53,7 +53,7 @@ rm -rf %{buildroot} %changelog -* Tue Jul 27 2010 Mamoru Tasaka - 3.09-5 +* Tue Jul 27 2010 Mamoru Tasaka - 3.09-6 - Bump release number for upgrade path * Wed Jul 21 2010 David Malcolm - 3.09-3 From 265ab2e8a271ba0f37b89997a054c99d790a13a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:13:55 +0000 Subject: [PATCH 036/153] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a0a01e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyYAML -# $Id$ -NAME := PyYAML -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7 From d976ea237373d6094693d8c150ddfd996d776a4d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:13:56 +0000 Subject: [PATCH 037/153] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a0a01e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyYAML -# $Id$ -NAME := PyYAML -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 1d4e21c9997043ef2bcf70084ed25fc058695b10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:13:57 +0000 Subject: [PATCH 038/153] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a0a01e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyYAML -# $Id$ -NAME := PyYAML -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4 From 750ee928aa8e64a504b1288a500243d6683efe86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:14:00 +0000 Subject: [PATCH 039/153] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a0a01e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyYAML -# $Id$ -NAME := PyYAML -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From bd4200327e53d8fae0fa5495acea7ce0e4d7ea69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:14:01 +0000 Subject: [PATCH 040/153] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a0a01e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyYAML -# $Id$ -NAME := PyYAML -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 94d0237ab8146042ae7552a8a1e0e28a9b5c0093 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:14:03 +0000 Subject: [PATCH 041/153] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a0a01e5..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: PyYAML -# $Id$ -NAME := PyYAML -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From 50265f154b8e89bc39b6d6fba24e9e1b92424b8e Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 2 Feb 2011 10:46:48 -0500 Subject: [PATCH 042/153] Add Python 3 support (bz674448) --- PyYAML.spec | 62 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 5 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index c9dacea..319055c 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,10 +1,12 @@ +%if 0%{?fedora} > 12 || 0%{?rhel} > 6 +%global with_python3 1 +%else %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -#====================================================================# +%endif Name: PyYAML Version: 3.09 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -12,8 +14,11 @@ License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - BuildRequires: python-devel, python-setuptools, libyaml-devel +%if 0%{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +%endif %description YAML is a data serialization format designed for human readability and @@ -28,31 +33,78 @@ 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. +%if 0%{?with_python3} +%package -n python3-PyYAML +Summary: YAML parser and emitter for Python +Group: Development/Libraries + +%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 %{name}-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif + %build CFLAGS="${RPM_OPT_FLAGS}" %{__python} setup.py --with-libyaml build +%if 0%{?with_python3} +pushd %{py3dir} +CFLAGS="${RPM_OPT_FLAGS}" %{__python3} setup.py --with-libyaml build +popd +%endif + %install rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install -O1 --skip-build --root %{buildroot} +popd +%endif + %clean rm -rf %{buildroot} %files -%defattr(-,root,root,-) +%defattr(644,root,root,755) %doc CHANGES LICENSE PKG-INFO README examples %{python_sitearch}/* +%if 0%{?with_python3} +%files -n python3-PyYAML +%defattr(644,root,root,755) +%doc CHANGES LICENSE PKG-INFO README examples +%{python3_sitearch}/* +%endif + %changelog +* 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 From 03e2aa63b31fd7635cc4467a74aae63e51f4d84d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:26:47 -0600 Subject: [PATCH 043/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 319055c..f5e85a9 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.09 -Release: 7%{?dist} +Release: 8%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -102,6 +102,9 @@ rm -rf %{buildroot} %changelog +* 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 From 62723716a3c3034e86e5f37c0315f4ad2ef14878 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 23 Jun 2011 15:37:53 -0400 Subject: [PATCH 044/153] New upstream release 3.10 --- .gitignore | 1 + PyYAML.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 89555f4..324f00f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ PyYAML-3.09.tar.gz +/PyYAML-3.10.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index f5e85a9..dd00a8f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -5,8 +5,8 @@ %endif Name: PyYAML -Version: 3.09 -Release: 8%{?dist} +Version: 3.10 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -102,6 +102,9 @@ rm -rf %{buildroot} %changelog +* 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 diff --git a/sources b/sources index c484ace..738a6e6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f219af2361e87fdc5e85e95b84c11d87 PyYAML-3.09.tar.gz +74c94a383886519e9e7b3dd1ee540247 PyYAML-3.10.tar.gz From 5f596a7ff267a375eabec0ed7dc29533c97cf3a1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:34:41 -0600 Subject: [PATCH 045/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index dd00a8f..47d303e 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -102,6 +102,9 @@ rm -rf %{buildroot} %changelog +* 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 From 927b2d9c90e03ed2582fa779c6b6ff30eb1cb182 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 27 Apr 2012 14:04:52 -0400 Subject: [PATCH 046/153] Add Provides for python-yaml (BZ#740390) --- PyYAML.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 47d303e..3d909e7 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -15,6 +15,8 @@ URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python-devel, python-setuptools, libyaml-devel +Provides: python-yaml = %{version}-%{release} +Provides: python-yaml = %{version}-%{release}%{?_isa} %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -102,6 +104,9 @@ rm -rf %{buildroot} %changelog +* 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 From 0c86512e39831abebe9ecb7ad1a5da974a85f420 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 27 Apr 2012 14:38:38 -0400 Subject: [PATCH 047/153] %{?_isa} goes with the name, not the version --- PyYAML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 3d909e7..5b9f486 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -16,7 +16,7 @@ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python-devel, python-setuptools, libyaml-devel Provides: python-yaml = %{version}-%{release} -Provides: python-yaml = %{version}-%{release}%{?_isa} +Provides: python-yaml%{?_isa} = %{version}-%{release} %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools From f4e4e2886cced49936a55cd34ea76bbf5093992b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 09:32:18 -0500 Subject: [PATCH 048/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 5b9f486..6a36210 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -104,6 +104,9 @@ rm -rf %{buildroot} %changelog +* 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) From 5cafbe8a0426e592242457d0682bf8c3d769533e Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 1 Aug 2012 16:41:18 -0400 Subject: [PATCH 049/153] remove rhel logic from with_python3 conditional --- PyYAML.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 6a36210..b162912 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} > 12 || 0%{?rhel} > 6 +%if 0%{?fedora} > 12 %global with_python3 1 %else %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -104,6 +104,9 @@ rm -rf %{buildroot} %changelog +* 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 From ef573bab5cb39476b4413bdeef876b0b87c882ac Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Sat, 4 Aug 2012 06:31:23 -0400 Subject: [PATCH 050/153] rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index b162912..f089f69 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -104,6 +104,9 @@ rm -rf %{buildroot} %changelog +* 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 From a33ccb5de3de8bd95a4643d6914ddf45c01b8b60 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 09:35:47 -0600 Subject: [PATCH 051/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index f089f69..93e4c27 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -104,6 +104,9 @@ rm -rf %{buildroot} %changelog +* 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 From 835acb406cbf673af684991e35daefe41a584793 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 18:17:15 -0500 Subject: [PATCH 052/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 93e4c27..45cd9b9 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -104,6 +104,9 @@ rm -rf %{buildroot} %changelog +* 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 From 5609e58c1335072a12cc75f409bcf7f6b8e0f98d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 8 Aug 2013 14:12:46 -0400 Subject: [PATCH 053/153] Add check section and run test suite --- PyYAML.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 45cd9b9..e3bec64 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.10 -Release: 8%{?dist} +Release: 9%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -86,6 +86,16 @@ popd %endif +%check +%{__python} setup.py test + +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py test +popd +%endif + + %clean rm -rf %{buildroot} @@ -104,6 +114,9 @@ rm -rf %{buildroot} %changelog +* 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 From ec2308055967bed9f73a663a49435a63eeb243b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 5 Dec 2013 10:32:08 +0100 Subject: [PATCH 054/153] fix sources --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 738a6e6..6e0105a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -f219af2361e87fdc5e85e95b84c11d87 PyYAML-3.09.tar.gz 74c94a383886519e9e7b3dd1ee540247 PyYAML-3.10.tar.gz From 9448c69e25a74b1dca93d8e3f68bde24a8b3a663 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 21 Apr 2014 09:57:35 -0400 Subject: [PATCH 055/153] New upstream release 3.11 (BZ#1081521) --- .gitignore | 1 + PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 324f00f..fac7114 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ PyYAML-3.09.tar.gz /PyYAML-3.10.tar.gz +/PyYAML-3.11.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index e3bec64..ee52680 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -5,8 +5,8 @@ %endif Name: PyYAML -Version: 3.10 -Release: 9%{?dist} +Version: 3.11 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -114,6 +114,9 @@ rm -rf %{buildroot} %changelog +* 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 diff --git a/sources b/sources index 6e0105a..86506a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -74c94a383886519e9e7b3dd1ee540247 PyYAML-3.10.tar.gz +f50e08ef0fe55178479d3a618efe21db PyYAML-3.11.tar.gz From 24e6324e8a12a020af11aa4d21d71a4fba7e1f77 Mon Sep 17 00:00:00 2001 From: Slavek Kabrda Date: Thu, 15 May 2014 16:03:57 +0200 Subject: [PATCH 056/153] Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index ee52680..572f8fc 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -114,6 +114,9 @@ rm -rf %{buildroot} %changelog +* 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) From 62472606416233e420ef025399a4dfa0aaaf5b99 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 18:09:58 -0500 Subject: [PATCH 057/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 572f8fc..975a2f0 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -114,6 +114,9 @@ rm -rf %{buildroot} %changelog +* 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 From d5e73fec0c3d67d01c2269a7e50a78af4cc56af2 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 4 Aug 2014 00:20:18 -0400 Subject: [PATCH 058/153] fix license handling --- PyYAML.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 975a2f0..3b8e573 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -102,18 +102,25 @@ rm -rf %{buildroot} %files %defattr(644,root,root,755) -%doc CHANGES LICENSE PKG-INFO README examples +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc CHANGES PKG-INFO README examples %{python_sitearch}/* %if 0%{?with_python3} %files -n python3-PyYAML %defattr(644,root,root,755) -%doc CHANGES LICENSE PKG-INFO README examples +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc CHANGES PKG-INFO README examples %{python3_sitearch}/* %endif %changelog +* 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 From 21632c51582b5d4ba24d220a12e20ab905ce3a97 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 19:07:53 +0000 Subject: [PATCH 059/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 3b8e573..fa6b279 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -118,6 +118,9 @@ rm -rf %{buildroot} %changelog +* 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 From 72978d4809b74646f946dca457e15a4fe44ec34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20=C4=8Cajka?= Date: Mon, 15 Sep 2014 13:27:38 +0200 Subject: [PATCH 060/153] Fixed typecast issues using debian patch(int->size_t)(BZ#1140189) --- PyYAML.spec | 35 +++++++++++------- debian-big-endian-fix.patch | 73 +++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 debian-big-endian-fix.patch diff --git a/PyYAML.spec b/PyYAML.spec index fa6b279..2444c37 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,21 +6,26 @@ Name: PyYAML Version: 3.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python-devel, python-setuptools, libyaml-devel +BuildRequires: Cython +BuildRequires: libyaml-devel Provides: python-yaml = %{version}-%{release} Provides: python-yaml%{?_isa} = %{version}-%{release} %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: python3-Cython %endif +# debian patch, upstream ticket http://pyyaml.org/ticket/247 and +# https://bitbucket.org/xi/pyyaml/issue/35/test-fails-on-be-s390-x-ppc64 +Patch0: debian-big-endian-fix.patch %description YAML is a data serialization format designed for human readability and @@ -57,26 +62,30 @@ configuration files to object serialization and persistance. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .be chmod a-x examples/yaml-highlight/yaml_hl.py -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif +# remove pre-generated file +rm -rf ext/_yaml.c %build -CFLAGS="${RPM_OPT_FLAGS}" %{__python} setup.py --with-libyaml build +# regenerate ext/_yaml.c +CFLAGS="${RPM_OPT_FLAGS}" %{__python} setup.py --with-libyaml build_ext %if 0%{?with_python3} +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}" %{__python} setup.py --with-libyaml build + %install -rm -rf %{buildroot} %{__python} setup.py install -O1 --skip-build --root %{buildroot} %if 0%{?with_python3} @@ -96,12 +105,7 @@ popd %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(644,root,root,755) %{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGES PKG-INFO README examples @@ -109,7 +113,6 @@ rm -rf %{buildroot} %if 0%{?with_python3} %files -n python3-PyYAML -%defattr(644,root,root,755) %{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGES PKG-INFO README examples @@ -118,6 +121,10 @@ rm -rf %{buildroot} %changelog +* 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 diff --git a/debian-big-endian-fix.patch b/debian-big-endian-fix.patch new file mode 100644 index 0000000..7991005 --- /dev/null +++ b/debian-big-endian-fix.patch @@ -0,0 +1,73 @@ +pyyaml FTBFS on the s390x buildd. It seems this is due to using int +where the libyaml API uses size_t. I tested the attached patch in +zelenka.d.o's sid chroot, and at least the python2 build/test worked (it +failed with the same error as the buildd pre-patching). +Patch by Julien Cristau +Add to the pyyaml package by Scott Kitterman +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676536 + +Index: pyyaml-3.10/ext/_yaml.pxd +=================================================================== +--- pyyaml-3.10.orig/ext/_yaml.pxd 2011-05-29 23:31:01.000000000 -0400 ++++ pyyaml-3.10/ext/_yaml.pxd 2012-06-08 16:33:54.309407701 -0400 +@@ -86,15 +86,15 @@ + YAML_MAPPING_END_EVENT + + ctypedef int yaml_read_handler_t(void *data, char *buffer, +- int size, int *size_read) except 0 ++ size_t size, size_t *size_read) except 0 + + ctypedef int yaml_write_handler_t(void *data, char *buffer, +- int size) except 0 ++ size_t size) except 0 + + ctypedef struct yaml_mark_t: +- int index +- int line +- int column ++ size_t index ++ size_t line ++ size_t column + ctypedef struct yaml_version_directive_t: + int major + int minor +@@ -113,7 +113,7 @@ + char *suffix + ctypedef struct _yaml_token_scalar_data_t: + char *value +- int length ++ size_t length + yaml_scalar_style_t style + ctypedef struct _yaml_token_version_directive_data_t: + int major +@@ -152,7 +152,7 @@ + char *anchor + char *tag + char *value +- int length ++ size_t length + int plain_implicit + int quoted_implicit + yaml_scalar_style_t style +Index: pyyaml-3.10/ext/_yaml.pyx +=================================================================== +--- pyyaml-3.10.orig/ext/_yaml.pyx 2011-05-29 23:31:01.000000000 -0400 ++++ pyyaml-3.10/ext/_yaml.pyx 2012-06-08 16:33:54.313409701 -0400 +@@ -905,7 +905,7 @@ + raise error + return 1 + +-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: ++cdef int input_handler(void *data, char *buffer, size_t size, size_t *read) except 0: + cdef CParser parser + parser = data + if parser.stream_cache is None: +@@ -1515,7 +1515,7 @@ + self.ascend_resolver() + return 1 + +-cdef int output_handler(void *data, char *buffer, int size) except 0: ++cdef int output_handler(void *data, char *buffer, size_t size) except 0: + cdef CEmitter emitter + emitter = data + if emitter.dump_unicode == 0: From c2497343a5fdbbd3ea116570ad38ca9fb1a353e8 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 23 Mar 2015 12:43:21 -0400 Subject: [PATCH 061/153] Add patch for CVE-2014-9130 (bug 1204829) --- PyYAML-CVE-2014-9130.patch | 35 +++++++++++++++++++++++++++++++++++ PyYAML.spec | 11 ++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 PyYAML-CVE-2014-9130.patch diff --git a/PyYAML-CVE-2014-9130.patch b/PyYAML-CVE-2014-9130.patch new file mode 100644 index 0000000..c47a9b5 --- /dev/null +++ b/PyYAML-CVE-2014-9130.patch @@ -0,0 +1,35 @@ +# HG changeset patch +# User Kirill Simonov +# Date 1417197216 21600 +# Node ID ddf211a41bb231c365fece5599b7e484e6dc33fc +# Parent 263dff6f9664ccdc532283ba5c7b282c0e436a7b +Removed invalid simple key assertion. + +diff --git a/lib/yaml/scanner.py b/lib/yaml/scanner.py +--- a/lib/yaml/scanner.py ++++ b/lib/yaml/scanner.py +@@ -297,10 +297,6 @@ + # Check if a simple key is required at the current position. + required = not self.flow_level and self.indent == self.column + +- # A simple key is required only if it is the first token in the current +- # line. Therefore it is always allowed. +- assert self.allow_simple_key or not required +- + # The next token might be a simple key. Let's save it's number and + # position. + if self.allow_simple_key: +diff --git a/lib3/yaml/scanner.py b/lib3/yaml/scanner.py +--- a/lib3/yaml/scanner.py ++++ b/lib3/yaml/scanner.py +@@ -297,10 +297,6 @@ + # Check if a simple key is required at the current position. + required = not self.flow_level and self.indent == self.column + +- # A simple key is required only if it is the first token in the current +- # line. Therefore it is always allowed. +- assert self.allow_simple_key or not required +- + # The next token might be a simple key. Let's save it's number and + # position. + if self.allow_simple_key: diff --git a/PyYAML.spec b/PyYAML.spec index 2444c37..9f8e3aa 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -27,6 +27,10 @@ BuildRequires: python3-Cython # https://bitbucket.org/xi/pyyaml/issue/35/test-fails-on-be-s390-x-ppc64 Patch0: debian-big-endian-fix.patch +# CVE-2014-9130 assert failure when processing wrapped strings +# https://bugzilla.redhat.com/show_bug.cgi?id=1204829 +Patch1: PyYAML-CVE-2014-9130.patch + %description YAML is a data serialization format designed for human readability and interaction with scripting languages. PyYAML is a YAML parser and @@ -65,6 +69,8 @@ configuration files to object serialization and persistance. %patch0 -p1 -b .be chmod a-x examples/yaml-highlight/yaml_hl.py +%patch1 -p1 + # remove pre-generated file rm -rf ext/_yaml.c @@ -121,6 +127,9 @@ popd %changelog +* 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 From 58939d72e59e1faa86615d9731bacd1671b7de9b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:07:21 +0000 Subject: [PATCH 062/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 9f8e3aa..56720e0 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -127,6 +127,9 @@ popd %changelog +* 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) From d1fc70f7c9aa51488115c8ab9638865f1867b6de Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 17 Jul 2015 09:42:02 -0400 Subject: [PATCH 063/153] Add provides for python2-yaml (RHBZ#1241678) --- PyYAML.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 56720e0..da293b3 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -18,6 +18,8 @@ BuildRequires: Cython BuildRequires: libyaml-devel Provides: python-yaml = %{version}-%{release} Provides: python-yaml%{?_isa} = %{version}-%{release} +Provides: python2-yaml = %{version}-%{release} +Provides: python2-yaml%{?_isa} = %{version}-%{release} %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -127,6 +129,9 @@ popd %changelog +* 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 From 4dac1c6599a6c895ceb72aeb32df4279f9491cb3 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Tue, 3 Nov 2015 20:17:41 +0100 Subject: [PATCH 064/153] Rebuilt for Python3.5 rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index da293b3..b8bb34f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -129,6 +129,9 @@ popd %changelog +* 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) From 6c051beba24656a4513e0184f72e3fb516af20d7 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 8 Dec 2015 09:28:04 -0500 Subject: [PATCH 065/153] Add provides for python3-yaml (RHBZ#1288807) --- PyYAML.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index b8bb34f..c3cdc84 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -50,6 +50,8 @@ configuration files to object serialization and persistance. %package -n python3-PyYAML Summary: YAML parser and emitter for Python Group: Development/Libraries +Provides: python3-yaml = %{version}-%{release} +Provides: python3-yaml%{?_isa} = %{version}-%{release} %description -n python3-PyYAML YAML is a data serialization format designed for human readability and @@ -129,6 +131,9 @@ popd %changelog +* 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 From 9b88a7677888a7b018306a92ebb9a16294896ac3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:38:06 +0000 Subject: [PATCH 066/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index c3cdc84..4868a8f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -131,6 +131,9 @@ popd %changelog +* 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) From 2edc3908f2f6d4358c40dd98a42e83909db0262d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 06:27:17 +0000 Subject: [PATCH 067/153] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 4868a8f..ff6b50f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.11 -Release: 12%{?dist} +Release: 13%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -131,6 +131,9 @@ popd %changelog +* 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 From e0e71ddb9784b54320ef7e34195d0b2ef9b83916 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 29 Aug 2016 15:33:12 -0400 Subject: [PATCH 068/153] New upstream release 3.12 (RHBZ#1371150) --- .gitignore | 1 + PyYAML.spec | 17 +++++------------ sources | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index fac7114..02a416a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ PyYAML-3.09.tar.gz /PyYAML-3.10.tar.gz /PyYAML-3.11.tar.gz +/PyYAML-3.12.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index ff6b50f..60444fd 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -5,8 +5,8 @@ %endif Name: PyYAML -Version: 3.11 -Release: 13%{?dist} +Version: 3.12 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -25,13 +25,6 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-Cython %endif -# debian patch, upstream ticket http://pyyaml.org/ticket/247 and -# https://bitbucket.org/xi/pyyaml/issue/35/test-fails-on-be-s390-x-ppc64 -Patch0: debian-big-endian-fix.patch - -# CVE-2014-9130 assert failure when processing wrapped strings -# https://bugzilla.redhat.com/show_bug.cgi?id=1204829 -Patch1: PyYAML-CVE-2014-9130.patch %description YAML is a data serialization format designed for human readability and @@ -70,11 +63,8 @@ configuration files to object serialization and persistance. %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .be chmod a-x examples/yaml-highlight/yaml_hl.py -%patch1 -p1 - # remove pre-generated file rm -rf ext/_yaml.c @@ -131,6 +121,9 @@ popd %changelog +* 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 diff --git a/sources b/sources index 86506a0..a74856a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f50e08ef0fe55178479d3a618efe21db PyYAML-3.11.tar.gz +4c129761b661d181ebf7ff4eb2d79950 PyYAML-3.12.tar.gz From 589aeb04c1d892ac4853f9071d5eba8eab224793 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Mon, 12 Dec 2016 17:23:14 +0100 Subject: [PATCH 069/153] Rebuild for Python 3.6 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 60444fd..f848d6d 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -121,6 +121,9 @@ popd %changelog +* 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) From f17d9a7c1f1c473779751401b5eb617abf452dbe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:21:08 +0000 Subject: [PATCH 070/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index f848d6d..edc53d2 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -121,6 +121,9 @@ popd %changelog +* 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 From c73b431ab593e964f00dde8e64df1e3fdf56bbb5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:04:36 +0000 Subject: [PATCH 071/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index edc53d2..7660d80 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -121,6 +121,9 @@ popd %changelog +* 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 From 2d121d6561bd493244d1df31fcd97a84e51610ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:06:59 +0000 Subject: [PATCH 072/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7660d80..4f9a2a7 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -121,6 +121,9 @@ popd %changelog +* 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 From c877a9f6cf12f5f81359ff916c67bdc9b0bd96a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:43:37 -0400 Subject: [PATCH 073/153] Python 2 binary package renamed to python2-pyyaml --- PyYAML.spec | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 4f9a2a7..1b2dfb4 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 5%{?dist} +Release: 6%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -16,29 +16,40 @@ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz BuildRequires: python-devel, python-setuptools, libyaml-devel BuildRequires: Cython BuildRequires: libyaml-devel -Provides: python-yaml = %{version}-%{release} -Provides: python-yaml%{?_isa} = %{version}-%{release} -Provides: python2-yaml = %{version}-%{release} -Provides: python2-yaml%{?_isa} = %{version}-%{release} %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-Cython %endif -%description -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 +%global _description\ +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. +%description %_description + +%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} +%{?python_provide:%python_provide python2-pyyaml} +# Remove before F30 +Provides: PyYAML%{?_isa} = %{version}-%{release} +Obsoletes: PyYAML < %{version}-%{release} + +%description -n python2-pyyaml %_description + %if 0%{?with_python3} %package -n python3-PyYAML Summary: YAML parser and emitter for Python @@ -105,7 +116,7 @@ popd %endif -%files +%files -n python2-pyyaml %{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGES PKG-INFO README examples @@ -121,6 +132,10 @@ popd %changelog +* 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 From 3e1f78f7d10ff62d4a9f9d85f2386a0db66974d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 20 Aug 2017 10:41:50 -0400 Subject: [PATCH 074/153] Add Provides for the old name without %_isa --- PyYAML.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 1b2dfb4..699663f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 6%{?dist} +Release: 7%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -45,6 +45,7 @@ Provides: python2-yaml = %{version}-%{release} Provides: python2-yaml%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python2-pyyaml} # Remove before F30 +Provides: PyYAML = %{version}-%{release} Provides: PyYAML%{?_isa} = %{version}-%{release} Obsoletes: PyYAML < %{version}-%{release} @@ -132,6 +133,9 @@ popd %changelog +* 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 From 60bf96a9c58d2402d682f51573425c86a8d6d530 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 27 Sep 2017 08:22:08 -0700 Subject: [PATCH 075/153] Cleanup spec file conditionals --- PyYAML.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 699663f..5f69a27 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} > 12 +%if 0%{?fedora} || 0%{?rhel} >= 8 %global with_python3 1 %else %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 7%{?dist} +Release: 8%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -133,6 +133,9 @@ popd %changelog +* 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 From fe5c6e1c6812bf1c03e2d1e5e165cc435161087d Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 11 Dec 2017 14:26:09 +0100 Subject: [PATCH 076/153] Fix ambiguous Python 2 dependency declarations --- PyYAML.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 5f69a27..6c8054e 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,14 +6,14 @@ Name: PyYAML Version: 3.12 -Release: 8%{?dist} +Release: 9%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries License: MIT URL: http://pyyaml.org/ Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz -BuildRequires: python-devel, python-setuptools, libyaml-devel +BuildRequires: python2-devel, python2-setuptools, libyaml-devel BuildRequires: Cython BuildRequires: libyaml-devel %if 0%{?with_python3} @@ -133,6 +133,10 @@ popd %changelog +* 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 From cd3566fbf84a4561647e9327d131eb4093477e9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:00:19 +0000 Subject: [PATCH 077/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 6c8054e..90e6721 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 9%{?dist} +Release: 10%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -133,6 +133,9 @@ popd %changelog +* 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) From fa3f73aea5518bebff9871eff33fd79acb41d237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 15 Jun 2018 22:25:27 +0200 Subject: [PATCH 078/153] Rebuilt for Python 3.7 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 90e6721..0f3bc32 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ Name: PyYAML Version: 3.12 -Release: 10%{?dist} +Release: 11%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -133,6 +133,9 @@ popd %changelog +* 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 From 00c98a1ea33b1adf42c2f79b0476822c689f34c8 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 27 Jun 2018 09:29:35 -0400 Subject: [PATCH 079/153] New upstream release 4.1 --- .gitignore | 2 + PyYAML-CVE-2014-9130.patch | 35 ------------------ PyYAML.spec | 19 ++++++---- debian-big-endian-fix.patch | 73 ------------------------------------- sources | 2 +- 5 files changed, 15 insertions(+), 116 deletions(-) delete mode 100644 PyYAML-CVE-2014-9130.patch delete mode 100644 debian-big-endian-fix.patch diff --git a/.gitignore b/.gitignore index 02a416a..ac383af 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ PyYAML-3.09.tar.gz /PyYAML-3.10.tar.gz /PyYAML-3.11.tar.gz /PyYAML-3.12.tar.gz +/PyYAML-4.1.tar.gz +/pyyaml-4.1.tar.gz diff --git a/PyYAML-CVE-2014-9130.patch b/PyYAML-CVE-2014-9130.patch deleted file mode 100644 index c47a9b5..0000000 --- a/PyYAML-CVE-2014-9130.patch +++ /dev/null @@ -1,35 +0,0 @@ -# HG changeset patch -# User Kirill Simonov -# Date 1417197216 21600 -# Node ID ddf211a41bb231c365fece5599b7e484e6dc33fc -# Parent 263dff6f9664ccdc532283ba5c7b282c0e436a7b -Removed invalid simple key assertion. - -diff --git a/lib/yaml/scanner.py b/lib/yaml/scanner.py ---- a/lib/yaml/scanner.py -+++ b/lib/yaml/scanner.py -@@ -297,10 +297,6 @@ - # Check if a simple key is required at the current position. - required = not self.flow_level and self.indent == self.column - -- # A simple key is required only if it is the first token in the current -- # line. Therefore it is always allowed. -- assert self.allow_simple_key or not required -- - # The next token might be a simple key. Let's save it's number and - # position. - if self.allow_simple_key: -diff --git a/lib3/yaml/scanner.py b/lib3/yaml/scanner.py ---- a/lib3/yaml/scanner.py -+++ b/lib3/yaml/scanner.py -@@ -297,10 +297,6 @@ - # Check if a simple key is required at the current position. - required = not self.flow_level and self.indent == self.column - -- # A simple key is required only if it is the first token in the current -- # line. Therefore it is always allowed. -- assert self.allow_simple_key or not required -- - # The next token might be a simple key. Let's save it's number and - # position. - if self.allow_simple_key: diff --git a/PyYAML.spec b/PyYAML.spec index 0f3bc32..16e1fec 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,3 +1,5 @@ +%global _name pyyaml + %if 0%{?fedora} || 0%{?rhel} >= 8 %global with_python3 1 %else @@ -5,14 +7,14 @@ %endif Name: PyYAML -Version: 3.12 -Release: 11%{?dist} +Version: 4.1 +Release: 1%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries License: MIT -URL: http://pyyaml.org/ -Source0: http://pyyaml.org/download/pyyaml/%{name}-%{version}.tar.gz +URL: https://github.com/yaml/pyyaml +Source0: https://github.com/yaml/pyyaml/archive/%{_name}-%{version}.tar.gz BuildRequires: python2-devel, python2-setuptools, libyaml-devel BuildRequires: Cython BuildRequires: libyaml-devel @@ -74,7 +76,7 @@ configuration files to object serialization and persistance. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{_name}-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -120,19 +122,22 @@ popd %files -n python2-pyyaml %{!?_licensedir:%global license %%doc} %license LICENSE -%doc CHANGES PKG-INFO README examples +%doc CHANGES README examples %{python_sitearch}/* %if 0%{?with_python3} %files -n python3-PyYAML %{!?_licensedir:%global license %%doc} %license LICENSE -%doc CHANGES PKG-INFO README examples +%doc CHANGES README examples %{python3_sitearch}/* %endif %changelog +* 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 diff --git a/debian-big-endian-fix.patch b/debian-big-endian-fix.patch deleted file mode 100644 index 7991005..0000000 --- a/debian-big-endian-fix.patch +++ /dev/null @@ -1,73 +0,0 @@ -pyyaml FTBFS on the s390x buildd. It seems this is due to using int -where the libyaml API uses size_t. I tested the attached patch in -zelenka.d.o's sid chroot, and at least the python2 build/test worked (it -failed with the same error as the buildd pre-patching). -Patch by Julien Cristau -Add to the pyyaml package by Scott Kitterman -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676536 - -Index: pyyaml-3.10/ext/_yaml.pxd -=================================================================== ---- pyyaml-3.10.orig/ext/_yaml.pxd 2011-05-29 23:31:01.000000000 -0400 -+++ pyyaml-3.10/ext/_yaml.pxd 2012-06-08 16:33:54.309407701 -0400 -@@ -86,15 +86,15 @@ - YAML_MAPPING_END_EVENT - - ctypedef int yaml_read_handler_t(void *data, char *buffer, -- int size, int *size_read) except 0 -+ size_t size, size_t *size_read) except 0 - - ctypedef int yaml_write_handler_t(void *data, char *buffer, -- int size) except 0 -+ size_t size) except 0 - - ctypedef struct yaml_mark_t: -- int index -- int line -- int column -+ size_t index -+ size_t line -+ size_t column - ctypedef struct yaml_version_directive_t: - int major - int minor -@@ -113,7 +113,7 @@ - char *suffix - ctypedef struct _yaml_token_scalar_data_t: - char *value -- int length -+ size_t length - yaml_scalar_style_t style - ctypedef struct _yaml_token_version_directive_data_t: - int major -@@ -152,7 +152,7 @@ - char *anchor - char *tag - char *value -- int length -+ size_t length - int plain_implicit - int quoted_implicit - yaml_scalar_style_t style -Index: pyyaml-3.10/ext/_yaml.pyx -=================================================================== ---- pyyaml-3.10.orig/ext/_yaml.pyx 2011-05-29 23:31:01.000000000 -0400 -+++ pyyaml-3.10/ext/_yaml.pyx 2012-06-08 16:33:54.313409701 -0400 -@@ -905,7 +905,7 @@ - raise error - return 1 - --cdef int input_handler(void *data, char *buffer, int size, int *read) except 0: -+cdef int input_handler(void *data, char *buffer, size_t size, size_t *read) except 0: - cdef CParser parser - parser = data - if parser.stream_cache is None: -@@ -1515,7 +1515,7 @@ - self.ascend_resolver() - return 1 - --cdef int output_handler(void *data, char *buffer, int size) except 0: -+cdef int output_handler(void *data, char *buffer, size_t size) except 0: - cdef CEmitter emitter - emitter = data - if emitter.dump_unicode == 0: diff --git a/sources b/sources index a74856a..314a53a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c129761b661d181ebf7ff4eb2d79950 PyYAML-3.12.tar.gz +SHA512 (pyyaml-4.1.tar.gz) = 3eb30d0d2f7e300dda98ad8378fa2ec4488071d165a7649d21ac32e1b3efeee14ee00ba86a32ba2db0c491866480f18480dec3e552ab7df82115bd9669833119 From e9931432fbbc82ff35c99591015ea24c9dd21e7f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 2 Jul 2018 17:19:07 +0100 Subject: [PATCH 080/153] Rebuilt for Python 3.7 Signed-off-by: Igor Gnatenko --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 16e1fec..eee54d1 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -8,7 +8,7 @@ Name: PyYAML Version: 4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -135,6 +135,9 @@ popd %changelog +* 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 From 08fe2345bfd53b69db2d3627813255a64363d3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 18:24:01 +0200 Subject: [PATCH 081/153] Rebuilt for Python 3.7 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index eee54d1..aebaa89 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -8,7 +8,7 @@ Name: PyYAML Version: 4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -135,6 +135,9 @@ popd %changelog +* 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 From bcbfc0506750c1b430d84156fcec49dc77a932b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:14:19 +0000 Subject: [PATCH 082/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index aebaa89..b3316ab 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -8,7 +8,7 @@ Name: PyYAML Version: 4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: YAML parser and emitter for Python Group: Development/Libraries @@ -135,6 +135,9 @@ popd %changelog +* 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 From 8dad75a7295191075b0b7da6c87967436710e351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 13 Jul 2018 01:11:58 +0200 Subject: [PATCH 083/153] Rename python3-PyYAML to python3-pyyaml - Modernize spec - Fix python2 invocation --- PyYAML.spec | 102 ++++++++++++++++++---------------------------------- 1 file changed, 35 insertions(+), 67 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index b3316ab..9168dfc 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,28 +1,23 @@ %global _name pyyaml - -%if 0%{?fedora} || 0%{?rhel} >= 8 -%global with_python3 1 -%else -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%endif - Name: PyYAML Version: 4.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: YAML parser and emitter for Python -Group: Development/Libraries License: MIT URL: https://github.com/yaml/pyyaml Source0: https://github.com/yaml/pyyaml/archive/%{_name}-%{version}.tar.gz -BuildRequires: python2-devel, python2-setuptools, libyaml-devel -BuildRequires: Cython + BuildRequires: libyaml-devel -%if 0%{?with_python3} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-Cython -%endif + +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-Cython + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-Cython + %global _description\ YAML is a data serialization format designed for human readability and\ @@ -39,8 +34,9 @@ configuration files to object serialization and persistance. %description %_description + %package -n python2-pyyaml -Summary: %summary +Summary: %summary Provides: python-yaml = %{version}-%{release} Provides: python-yaml%{?_isa} = %{version}-%{release} Provides: python2-yaml = %{version}-%{release} @@ -53,26 +49,18 @@ Obsoletes: PyYAML < %{version}-%{release} %description -n python2-pyyaml %_description -%if 0%{?with_python3} -%package -n python3-PyYAML -Summary: YAML parser and emitter for Python -Group: Development/Libraries -Provides: python3-yaml = %{version}-%{release} -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. +%package -n python3-pyyaml +Summary: %summary +Provides: python3-yaml = %{version}-%{release} +Provides: python3-yaml%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python3-pyyaml} +# Remove before F31 +Provides: python3-PyYAML = %{version}-%{release} +Provides: python3-PyYAML%{?_isa} = %{version}-%{release} +Obsoletes: python3-PyYAML < 4.1-5 -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 +%description -n python3-pyyaml %_description %prep @@ -84,57 +72,37 @@ rm -rf ext/_yaml.c %build -# regenerate ext/_yaml.c -CFLAGS="${RPM_OPT_FLAGS}" %{__python} setup.py --with-libyaml build_ext - -%if 0%{?with_python3} -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}" %{__python} setup.py --with-libyaml build +%py2_build +%py3_build %install -%{__python} setup.py install -O1 --skip-build --root %{buildroot} - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install -O1 --skip-build --root %{buildroot} -popd -%endif +%py2_install +%py3_install %check -%{__python} setup.py test - -%if 0%{?with_python3} -pushd %{py3dir} +%{__python2} setup.py test %{__python3} setup.py test -popd -%endif %files -n python2-pyyaml -%{!?_licensedir:%global license %%doc} %license LICENSE %doc CHANGES README examples -%{python_sitearch}/* +%{python2_sitearch}/* -%if 0%{?with_python3} -%files -n python3-PyYAML -%{!?_licensedir:%global license %%doc} +%files -n python3-pyyaml %license LICENSE %doc CHANGES README examples %{python3_sitearch}/* -%endif %changelog +* 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 From 94a550161864908fb8117771728c44343c27598e Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 13 Jul 2018 13:08:18 -0400 Subject: [PATCH 084/153] New upstream beta release 4.2b4 --- .gitignore | 1 + PyYAML.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ac383af..2d97880 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ PyYAML-3.09.tar.gz /PyYAML-3.12.tar.gz /PyYAML-4.1.tar.gz /pyyaml-4.1.tar.gz +/PyYAML-4.2b4.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 9168dfc..2e5bfc1 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,13 +1,13 @@ -%global _name pyyaml Name: PyYAML -Version: 4.1 -Release: 5%{?dist} +Version: 4.2b4 +Release: 1%{?dist} Summary: YAML parser and emitter for Python License: MIT URL: https://github.com/yaml/pyyaml -Source0: https://github.com/yaml/pyyaml/archive/%{_name}-%{version}.tar.gz +Source0: https://github.com/yaml/pyyaml/archive/%{name}-%{version}.tar.gz +BuildRequires: gcc BuildRequires: libyaml-devel BuildRequires: python2-devel @@ -64,7 +64,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q -n %{_name}-%{version} +%setup -q -n %{name}-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -98,6 +98,13 @@ rm -rf ext/_yaml.c %changelog +* Fri Jul 13 2018 John Eckersberg - 4.2b4-1 +- 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 diff --git a/sources b/sources index 314a53a..f924b5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pyyaml-4.1.tar.gz) = 3eb30d0d2f7e300dda98ad8378fa2ec4488071d165a7649d21ac32e1b3efeee14ee00ba86a32ba2db0c491866480f18480dec3e552ab7df82115bd9669833119 +SHA512 (PyYAML-4.2b4.tar.gz) = 9ca90bcbbdd51f7df24e200e6fed5262f6e0a12b5eb0aff359519e132a93e67bd2967ed6dc0937d44450e0f6735fb378154cfe88b44b175cc96a631c1c13f1ae From f347cc18fa848f299bda23a05dbe9f5496ad3869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 13 Jul 2018 20:30:28 +0200 Subject: [PATCH 085/153] Fix the prerelease evr See https://fedoraproject.org/wiki/Packaging:Versioning#Prerelease_versions --- PyYAML.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 2e5bfc1..135e39d 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,6 +1,6 @@ Name: PyYAML -Version: 4.2b4 -Release: 1%{?dist} +Version: 4.2 +Release: 0.1.b4%{?dist} Summary: YAML parser and emitter for Python License: MIT @@ -98,7 +98,7 @@ rm -rf ext/_yaml.c %changelog -* Fri Jul 13 2018 John Eckersberg - 4.2b4-1 +* 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 From 18389c7bab0e37adab709808e39d8e2ebfab0720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 13 Jul 2018 20:38:13 +0200 Subject: [PATCH 086/153] Use upstream version when working with Source tarball --- PyYAML.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 135e39d..c63cd6e 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,11 +1,12 @@ Name: PyYAML Version: 4.2 Release: 0.1.b4%{?dist} +%global uversion %{version}b4 Summary: YAML parser and emitter for Python License: MIT URL: https://github.com/yaml/pyyaml -Source0: https://github.com/yaml/pyyaml/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/yaml/pyyaml/archive/%{name}-%{uversion}.tar.gz BuildRequires: gcc BuildRequires: libyaml-devel @@ -64,7 +65,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{uversion} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file From 9df8eb64af70d773b574b3e95caf9b5b9ea22c23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 11:50:48 +0000 Subject: [PATCH 087/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index c63cd6e..44c3358 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,6 +1,6 @@ Name: PyYAML Version: 4.2 -Release: 0.1.b4%{?dist} +Release: 0.2.b4%{?dist} %global uversion %{version}b4 Summary: YAML parser and emitter for Python @@ -99,6 +99,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From ff70d178598319fe32fb144ba1f5a8a3197d376d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 25 Feb 2019 16:25:11 -0500 Subject: [PATCH 088/153] - New upstream beta release 5.1b1 (rhbz#1680457) - Typo fix (rhbz#1680463) --- .gitignore | 1 + PyYAML.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2d97880..8dd71b2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ PyYAML-3.09.tar.gz /PyYAML-4.1.tar.gz /pyyaml-4.1.tar.gz /PyYAML-4.2b4.tar.gz +/PyYAML-5.1b1.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 44c3358..0a03b7a 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,7 +1,7 @@ Name: PyYAML -Version: 4.2 -Release: 0.2.b4%{?dist} -%global uversion %{version}b4 +Version: 5.1 +Release: 0.1.b1%{?dist} +%global uversion %{version}b1 Summary: YAML parser and emitter for Python License: MIT @@ -31,7 +31,7 @@ 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. +configuration files to object serialization and persistence. %description %_description @@ -65,7 +65,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q -n %{name}-%{uversion} +%setup -q -n pyyaml-%{uversion} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -99,6 +99,10 @@ rm -rf ext/_yaml.c %changelog +* 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 diff --git a/sources b/sources index f924b5c..4785962 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyYAML-4.2b4.tar.gz) = 9ca90bcbbdd51f7df24e200e6fed5262f6e0a12b5eb0aff359519e132a93e67bd2967ed6dc0937d44450e0f6735fb378154cfe88b44b175cc96a631c1c13f1ae +SHA512 (PyYAML-5.1b1.tar.gz) = 52655642811bde09ea84caab551a99ee8653c2e51d91e3044c727662fffbc97a74909b4ae26f8828fdabd1e7e7890169defcf085a613825a8f8cf2599eb4db06 From 118df166c2b443c6c3c6d55ee14e459e8b7a91e7 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 28 Feb 2019 10:34:13 -0500 Subject: [PATCH 089/153] New upstream beta release 5.1b3 (rhbz#1683884) --- .gitignore | 1 + PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8dd71b2..e21e46c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ PyYAML-3.09.tar.gz /pyyaml-4.1.tar.gz /PyYAML-4.2b4.tar.gz /PyYAML-5.1b1.tar.gz +/PyYAML-5.1b3.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 0a03b7a..cd50897 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,7 +1,7 @@ Name: PyYAML Version: 5.1 -Release: 0.1.b1%{?dist} -%global uversion %{version}b1 +Release: 0.1.b3%{?dist} +%global uversion %{version}b3 Summary: YAML parser and emitter for Python License: MIT @@ -99,6 +99,9 @@ rm -rf ext/_yaml.c %changelog +* 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) diff --git a/sources b/sources index 4785962..4bea0d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyYAML-5.1b1.tar.gz) = 52655642811bde09ea84caab551a99ee8653c2e51d91e3044c727662fffbc97a74909b4ae26f8828fdabd1e7e7890169defcf085a613825a8f8cf2599eb4db06 +SHA512 (PyYAML-5.1b3.tar.gz) = fdd2440067b14d5f67acf9da77a7d72aed072097cd099ccd8f6583c554d4b1e46afac59306022c81cc37049073bc3e0be953b143627f032c1e6f706dc6b3e6e0 From 2d81f03dc5cce2a666e64ee3b30d34c925bd5215 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 8 Mar 2019 10:21:13 -0500 Subject: [PATCH 090/153] New upstream beta release 5.1b6 (rhbz#1686643) --- .gitignore | 1 + PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e21e46c..a595bd9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ PyYAML-3.09.tar.gz /PyYAML-4.2b4.tar.gz /PyYAML-5.1b1.tar.gz /PyYAML-5.1b3.tar.gz +/PyYAML-5.1b6.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index cd50897..c280858 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,7 +1,7 @@ Name: PyYAML Version: 5.1 -Release: 0.1.b3%{?dist} -%global uversion %{version}b3 +Release: 0.1.b6%{?dist} +%global uversion %{version}b6 Summary: YAML parser and emitter for Python License: MIT @@ -99,6 +99,9 @@ rm -rf ext/_yaml.c %changelog +* 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) diff --git a/sources b/sources index 4bea0d9..19277ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyYAML-5.1b3.tar.gz) = fdd2440067b14d5f67acf9da77a7d72aed072097cd099ccd8f6583c554d4b1e46afac59306022c81cc37049073bc3e0be953b143627f032c1e6f706dc6b3e6e0 +SHA512 (PyYAML-5.1b6.tar.gz) = 5f1e2e2b20edc95f746930621c11b90bc134a3132ef8c39cde5ec2f95574b173f56d42bf5e604f680fd0173d3fe7586569318a87dbbcae7b64d34c7e013bac98 From df56c4d5ae3f5f61f90965ff196f082730384e77 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 13 Mar 2019 15:16:50 -0400 Subject: [PATCH 091/153] New upstream release 5.1 (rhbz#1688414) Fixes CVE-2017-18342 (rhbz#1595744) --- .gitignore | 1 + PyYAML.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a595bd9..5205454 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ PyYAML-3.09.tar.gz /PyYAML-5.1b1.tar.gz /PyYAML-5.1b3.tar.gz /PyYAML-5.1b6.tar.gz +/PyYAML-5.1.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index c280858..37ba538 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,7 +1,7 @@ Name: PyYAML Version: 5.1 -Release: 0.1.b6%{?dist} -%global uversion %{version}b6 +Release: 1%{?dist} +%global uversion %{version} Summary: YAML parser and emitter for Python License: MIT @@ -65,7 +65,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q -n pyyaml-%{uversion} +%setup -q -n %{name}-%{uversion} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -99,6 +99,10 @@ rm -rf ext/_yaml.c %changelog +* 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) diff --git a/sources b/sources index 19277ec..4d81cd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyYAML-5.1b6.tar.gz) = 5f1e2e2b20edc95f746930621c11b90bc134a3132ef8c39cde5ec2f95574b173f56d42bf5e604f680fd0173d3fe7586569318a87dbbcae7b64d34c7e013bac98 +SHA512 (PyYAML-5.1.tar.gz) = 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd From e2295c1b537fa847bce039b5cda3b5780375259e Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 7 Jun 2019 10:44:57 -0400 Subject: [PATCH 092/153] New upstream release 5.1.1 (rhbz#1718110) --- .gitignore | 1 + PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5205454..2f7301c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ PyYAML-3.09.tar.gz /PyYAML-5.1b3.tar.gz /PyYAML-5.1b6.tar.gz /PyYAML-5.1.tar.gz +/PyYAML-5.1.1.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 37ba538..e1c28dd 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,5 +1,5 @@ Name: PyYAML -Version: 5.1 +Version: 5.1.1 Release: 1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -65,7 +65,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q -n %{name}-%{uversion} +%setup -q -n pyyaml-%{uversion} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -99,6 +99,9 @@ rm -rf ext/_yaml.c %changelog +* 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) diff --git a/sources b/sources index 4d81cd3..db19039 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyYAML-5.1.tar.gz) = 8f27f92bdfa310a99dd6d83947332cc033fa18f0011998bb585ad5c4340a2da20d8c20bfdb53beaae15651198d1240c986818379b0a05b230f74d1f30f53e7fd +SHA512 (PyYAML-5.1.1.tar.gz) = 5c89f432b370990702db74b1e54fa185c38d2666377d3325aebcbb4841897aa2039b10a2c8196ce7ed4bb1300a854312335d3475821d785016190d70195f1480 From 2b84981718c8cda1c7c04baedb8fe6394ffe2689 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 15 Jul 2019 12:41:39 +0200 Subject: [PATCH 093/153] Remove build dependency on python2-Cython The output of Cython doesn't depend on the interpreter that runs it, so files from py3_build can be reused for the Python 2 build. This should help break up one of the build/test dependency cycles involving python2 versions of popular packages: Cython, PyYAML, pip, six, pytest, setuptools. --- PyYAML.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index e1c28dd..6e2a0d8 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,6 +1,6 @@ Name: PyYAML Version: 5.1.1 -Release: 1%{?dist} +Release: 2%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -13,7 +13,6 @@ BuildRequires: libyaml-devel BuildRequires: python2-devel BuildRequires: python2-setuptools -BuildRequires: python2-Cython BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -73,9 +72,11 @@ rm -rf ext/_yaml.c %build -%py2_build %py3_build +# py2_build reuses Cython output from py3_build +%py2_build + %install %py2_install @@ -99,6 +100,9 @@ rm -rf ext/_yaml.c %changelog +* 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) From 7e6003640e9d92ec718ea38e5e7e73c83eb55698 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 16:08:01 +0000 Subject: [PATCH 094/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 6e2a0d8..969a24b 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,6 +1,6 @@ Name: PyYAML Version: 5.1.1 -Release: 2%{?dist} +Release: 3%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -100,6 +100,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From c9806f7c7fc06ec89eabbc9a1e0a78de4057e51a Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 1 Aug 2019 09:53:09 -0400 Subject: [PATCH 095/153] New upstream release 5.1.2 --- .gitignore | 1 + PyYAML.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2f7301c..6b8568d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ PyYAML-3.09.tar.gz /PyYAML-5.1b6.tar.gz /PyYAML-5.1.tar.gz /PyYAML-5.1.1.tar.gz +/PyYAML-5.1.2.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 969a24b..96ccb31 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,6 +1,6 @@ Name: PyYAML -Version: 5.1.1 -Release: 3%{?dist} +Version: 5.1.2 +Release: 1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -64,7 +64,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q -n pyyaml-%{uversion} +%setup -q chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -100,6 +100,9 @@ rm -rf ext/_yaml.c %changelog +* 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 diff --git a/sources b/sources index db19039..eba5090 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyYAML-5.1.1.tar.gz) = 5c89f432b370990702db74b1e54fa185c38d2666377d3325aebcbb4841897aa2039b10a2c8196ce7ed4bb1300a854312335d3475821d785016190d70195f1480 +SHA512 (PyYAML-5.1.2.tar.gz) = b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0 From def428a584a684d0419414cc403190db027a84ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 22:12:11 +0200 Subject: [PATCH 096/153] Rebuilt for Python 3.8 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 96ccb31..61cddf3 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,6 +1,6 @@ Name: PyYAML Version: 5.1.2 -Release: 1%{?dist} +Release: 2%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -100,6 +100,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From 8cc459b3430118773090eefa263b18d133ab8363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 20 Sep 2019 00:55:53 +0200 Subject: [PATCH 097/153] Stop providing PyYAML from python2-pyyaml, Python now means Python 3 --- PyYAML.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 61cddf3..7d77c12 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,6 +1,6 @@ Name: PyYAML Version: 5.1.2 -Release: 2%{?dist} +Release: 3%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -42,10 +42,6 @@ Provides: python-yaml%{?_isa} = %{version}-%{release} Provides: python2-yaml = %{version}-%{release} Provides: python2-yaml%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python2-pyyaml} -# Remove before F30 -Provides: PyYAML = %{version}-%{release} -Provides: PyYAML%{?_isa} = %{version}-%{release} -Obsoletes: PyYAML < %{version}-%{release} %description -n python2-pyyaml %_description @@ -100,6 +96,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From 8b822c03283ce659be1fb1d38e90b40b1a2f4f64 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Mon, 18 Nov 2019 09:51:01 +0100 Subject: [PATCH 098/153] Add bcond for Python 2 subpackage --- PyYAML.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7d77c12..850352d 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,3 +1,6 @@ +# Prepared for Python 2 removal +%bcond_without python2 + Name: PyYAML Version: 5.1.2 Release: 3%{?dist} @@ -11,8 +14,10 @@ Source0: https://github.com/yaml/pyyaml/archive/%{name}-%{uversion}.tar.g BuildRequires: gcc BuildRequires: libyaml-devel +%if %{with python2} BuildRequires: python2-devel BuildRequires: python2-setuptools +%endif BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -35,6 +40,7 @@ configuration files to object serialization and persistence. %description %_description +%if %{with python2} %package -n python2-pyyaml Summary: %summary Provides: python-yaml = %{version}-%{release} @@ -44,7 +50,7 @@ Provides: python2-yaml%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python2-pyyaml} %description -n python2-pyyaml %_description - +%endif %package -n python3-pyyaml Summary: %summary @@ -70,24 +76,32 @@ 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 python2-pyyaml %license LICENSE %doc CHANGES README examples %{python2_sitearch}/* +%endif %files -n python3-pyyaml %license LICENSE From 6cf2444e1fd48af55a4a978116f2fc0ee5b33e07 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Wed, 20 Nov 2019 12:31:40 +0100 Subject: [PATCH 099/153] Fix Source0 URL --- PyYAML.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 850352d..f78c821 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -9,7 +9,7 @@ Summary: YAML parser and emitter for Python License: MIT URL: https://github.com/yaml/pyyaml -Source0: https://github.com/yaml/pyyaml/archive/%{name}-%{uversion}.tar.gz +Source0: https://github.com/yaml/pyyaml/archive/%{uversion}.tar.gz BuildRequires: gcc BuildRequires: libyaml-devel @@ -66,7 +66,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q +%setup -q -n pyyaml-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file From f0fb35f7b6c8c9ab611caeb617663a6422305a03 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 22 Nov 2019 10:32:42 -0500 Subject: [PATCH 100/153] Build without python2 by default (rhbz#1775075) --- .gitignore | 1 + PyYAML.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6b8568d..dd88c61 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ PyYAML-3.09.tar.gz /PyYAML-5.1.tar.gz /PyYAML-5.1.1.tar.gz /PyYAML-5.1.2.tar.gz +/5.1.2.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index f78c821..75d010c 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,9 +1,9 @@ -# Prepared for Python 2 removal -%bcond_without python2 +# Python 2 removal, RHBZ#1775075 +%bcond_with python2 Name: PyYAML Version: 5.1.2 -Release: 3%{?dist} +Release: 4%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -66,7 +66,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q -n pyyaml-%{version} +%setup -q chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -110,6 +110,9 @@ rm -rf ext/_yaml.c %changelog +* 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 diff --git a/sources b/sources index eba5090..022f9ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyYAML-5.1.2.tar.gz) = b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0 +SHA512 (5.1.2.tar.gz) = b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0 From 00b2e2f74878f022bcc89e3028d68fe1fbc4854d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 3 Dec 2019 09:29:28 -0500 Subject: [PATCH 101/153] New upstream release 5.2 --- .gitignore | 1 + PyYAML.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dd88c61..4d80fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ PyYAML-3.09.tar.gz /PyYAML-5.1.1.tar.gz /PyYAML-5.1.2.tar.gz /5.1.2.tar.gz +/5.2.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 75d010c..5509613 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,8 +2,8 @@ %bcond_with python2 Name: PyYAML -Version: 5.1.2 -Release: 4%{?dist} +Version: 5.2 +Release: 1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -66,7 +66,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q +%setup -q -n pyyaml-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -110,6 +110,9 @@ rm -rf ext/_yaml.c %changelog +* 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) diff --git a/sources b/sources index 022f9ad..230001f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.1.2.tar.gz) = b5ee201c612486a95c87b7e41d474313160284359b8b30ababc80b51325aef9dd7dc27eb3b8a03a4749cb8c7e3789c5684d5c285fe35d4b20be1f189641531e0 +SHA512 (5.2.tar.gz) = 8d8ec87cf5ce7f4299da5a7ffbaee60372bf1606d6e527f0897cde7cea3234100502767c0975027151bc99549d9d8edf243c003ea08948670f367e9778abdc89 From e34ab79b9739a1d8e27f34a47940f7bff62e8d07 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 6 Jan 2020 15:51:42 -0500 Subject: [PATCH 102/153] New upstream release 5.3 --- .gitignore | 1 + PyYAML.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4d80fa3..0a22863 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ PyYAML-3.09.tar.gz /PyYAML-5.1.2.tar.gz /5.1.2.tar.gz /5.2.tar.gz +/5.3.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 5509613..744eeb0 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -2,7 +2,7 @@ %bcond_with python2 Name: PyYAML -Version: 5.2 +Version: 5.3 Release: 1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -110,6 +110,9 @@ rm -rf ext/_yaml.c %changelog +* 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 diff --git a/sources b/sources index 230001f..4624223 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.2.tar.gz) = 8d8ec87cf5ce7f4299da5a7ffbaee60372bf1606d6e527f0897cde7cea3234100502767c0975027151bc99549d9d8edf243c003ea08948670f367e9778abdc89 +SHA512 (5.3.tar.gz) = 51e07dd80d4e2758429c18e55d7664b8f8e3fb2129f74655cefe3e13ac2838148432f2736d5304e107c9241bcf3e556e313aa0e71560e59df8c49bdfffd0fb9d From fcc6c570f6b29283d875822dfd2daf1542425156 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 09:42:57 +0000 Subject: [PATCH 103/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 744eeb0..9b25b30 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -3,7 +3,7 @@ Name: PyYAML Version: 5.3 -Release: 1%{?dist} +Release: 2%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -110,6 +110,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From 6797a272e9ce466c4c4a321e7b22ef359ca2e147 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 2 Mar 2020 10:08:58 -0500 Subject: [PATCH 104/153] Fix python2 on Fedora < 32 (rhbz#1808812) --- PyYAML.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 9b25b30..7f6da99 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,9 +1,13 @@ # Python 2 removal, RHBZ#1775075 +%if 0%{fedora} >= 32 %bcond_with python2 +%else +%bcond_without python2 +%endif Name: PyYAML Version: 5.3 -Release: 2%{?dist} +Release: 3%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -110,6 +114,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From 36361a9243fdda1019ac68b6313b9eeab7c94991 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 Mar 2020 08:24:15 +0100 Subject: [PATCH 105/153] Add back PyYAML provides on F31 and older There's still packages in the F31 repos that require PyYAML. --- PyYAML.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7f6da99..238bf25 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 5.3 -Release: 3%{?dist} +Release: 4%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -51,6 +51,8 @@ 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 @@ -114,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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) From bd203720cf11210512ba5f7ea77b258bf3ec800d Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 19 Mar 2020 09:31:46 -0400 Subject: [PATCH 106/153] New upstream release 5.3.1 (rhbz#1814882) --- .gitignore | 1 + PyYAML.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0a22863..42c280a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ PyYAML-3.09.tar.gz /5.1.2.tar.gz /5.2.tar.gz /5.3.tar.gz +/5.3.1.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 238bf25..f8b2569 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,8 +6,8 @@ %endif Name: PyYAML -Version: 5.3 -Release: 4%{?dist} +Version: 5.3.1 +Release: 1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,10 @@ rm -rf ext/_yaml.c %changelog +* 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 diff --git a/sources b/sources index 4624223..210b3c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.3.tar.gz) = 51e07dd80d4e2758429c18e55d7664b8f8e3fb2129f74655cefe3e13ac2838148432f2736d5304e107c9241bcf3e556e313aa0e71560e59df8c49bdfffd0fb9d +SHA512 (5.3.1.tar.gz) = 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556 From 9abd7fefa2a380d48e54c4cda24620b2188bbae1 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 18 May 2020 09:31:51 -0400 Subject: [PATCH 107/153] Fix fedora conditional macro (rhbz#1836656) --- PyYAML.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index f8b2569..b2b83df 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,5 +1,5 @@ # Python 2 removal, RHBZ#1775075 -%if 0%{fedora} >= 32 +%if 0%{?fedora} >= 32 %bcond_with python2 %else %bcond_without python2 @@ -7,7 +7,7 @@ Name: PyYAML Version: 5.3.1 -Release: 1%{?dist} +Release: 2%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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) From fb49c4f3e2ceca53051d1407b0fa5583893f32b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 21:51:55 +0200 Subject: [PATCH 108/153] Rebuilt for Python 3.9 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index b2b83df..e35357a 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 5.3.1 -Release: 2%{?dist} +Release: 3%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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) From 402b3d57aa0c84af004ba2765dfecdd73615e5c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 10:36:47 +0000 Subject: [PATCH 109/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index e35357a..e921db3 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 5.3.1 -Release: 3%{?dist} +Release: 4%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From fdae8aa3a5bd478cd8a685a6ec2cd267241335dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 24 Nov 2020 00:57:45 +0100 Subject: [PATCH 110/153] Disable Python 2 build on RHEL 9+ --- PyYAML.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index e921db3..7b0a7e4 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,5 +1,5 @@ # Python 2 removal, RHBZ#1775075 -%if 0%{?fedora} >= 32 +%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 %bcond_with python2 %else %bcond_without python2 @@ -7,7 +7,7 @@ Name: PyYAML Version: 5.3.1 -Release: 4%{?dist} +Release: 5%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From e9684db2921f883b2968efecda532eaf940b07d1 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 14 Jan 2021 13:40:26 -0500 Subject: [PATCH 111/153] New upstream beta release 5.4b1 (rhbz#1916034) --- .gitignore | 1 + PyYAML.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 42c280a..ecd8f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ PyYAML-3.09.tar.gz /5.2.tar.gz /5.3.tar.gz /5.3.1.tar.gz +/5.4b1.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 7b0a7e4..c11995f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,9 +6,9 @@ %endif Name: PyYAML -Version: 5.3.1 -Release: 5%{?dist} -%global uversion %{version} +Version: 5.4 +Release: 0.1.b1%{?dist} +%global uversion %{version}b1 Summary: YAML parser and emitter for Python License: MIT @@ -72,7 +72,7 @@ Obsoletes: python3-PyYAML < 4.1-5 %prep -%setup -q -n pyyaml-%{version} +%setup -q -n pyyaml-%{uversion} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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+ diff --git a/sources b/sources index 210b3c1..4bcfa15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.3.1.tar.gz) = 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556 +SHA512 (5.4b1.tar.gz) = 3eced24b715971228f0d3f3c793c6c8bc7bf259ead77e0ee552f3340fb449a7cc3ae0ec6ef95400784c2a5802a85c67defb61c6adfb7130a187cd4b3544471cf From eff010b34466807968b018d1c1072f62821d43f5 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Fri, 15 Jan 2021 09:04:10 -0500 Subject: [PATCH 112/153] New upstream beta release 5.4b2 (rhbz#1916496) --- .gitignore | 1 + PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ecd8f6f..701a20b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ PyYAML-3.09.tar.gz /5.3.tar.gz /5.3.1.tar.gz /5.4b1.tar.gz +/5.4b2.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index c11995f..9849ff9 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,8 +7,8 @@ Name: PyYAML Version: 5.4 -Release: 0.1.b1%{?dist} -%global uversion %{version}b1 +Release: 0.1.b2%{?dist} +%global uversion %{version}b2 Summary: YAML parser and emitter for Python License: MIT @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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) diff --git a/sources b/sources index 4bcfa15..265e58f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.4b1.tar.gz) = 3eced24b715971228f0d3f3c793c6c8bc7bf259ead77e0ee552f3340fb449a7cc3ae0ec6ef95400784c2a5802a85c67defb61c6adfb7130a187cd4b3544471cf +SHA512 (5.4b2.tar.gz) = 16cdc7016112d7b13e65a682c7fb579e24fba4f75be095d7aee5049089c80b5731e023c85c3ca16e055846f0b60d166a89553301bb05d58d9dda09c72359c5b9 From 665ad9c9391bee5d46a3767021f45ca27c8355f0 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 20 Jan 2021 09:58:17 -0500 Subject: [PATCH 113/153] New upstream release 5.4 (CVE-2020-14343) --- .gitignore | 1 + PyYAML.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 701a20b..855dbca 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ PyYAML-3.09.tar.gz /5.3.1.tar.gz /5.4b1.tar.gz /5.4b2.tar.gz +/5.4.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 9849ff9..dd9cbf4 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,8 +7,8 @@ Name: PyYAML Version: 5.4 -Release: 0.1.b2%{?dist} -%global uversion %{version}b2 +Release: 1%{?dist} +%global uversion %{version} Summary: YAML parser and emitter for Python License: MIT @@ -116,6 +116,10 @@ rm -rf ext/_yaml.c %changelog +* 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) diff --git a/sources b/sources index 265e58f..6827a4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.4b2.tar.gz) = 16cdc7016112d7b13e65a682c7fb579e24fba4f75be095d7aee5049089c80b5731e023c85c3ca16e055846f0b60d166a89553301bb05d58d9dda09c72359c5b9 +SHA512 (5.4.tar.gz) = a76f9cf1838380b2e509bf1d5251f175cca1b413aadc511517de5fb3b4743747918f94abc1cf1976171731a1ba67596def3cb0652d08e1e3af3235cf7c0a610f From ba402f640bc13873b4dd32afb7fd34f3ad1ce03f Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 21 Jan 2021 11:18:26 -0500 Subject: [PATCH 114/153] New upstream release 5.4.1 (rhbz#1918523) --- .gitignore | 1 + PyYAML.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 855dbca..58b2104 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ PyYAML-3.09.tar.gz /5.4b1.tar.gz /5.4b2.tar.gz /5.4.tar.gz +/5.4.1.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index dd9cbf4..e548a17 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,7 +6,7 @@ %endif Name: PyYAML -Version: 5.4 +Version: 5.4.1 Release: 1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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 diff --git a/sources b/sources index 6827a4d..9893b64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.4.tar.gz) = a76f9cf1838380b2e509bf1d5251f175cca1b413aadc511517de5fb3b4743747918f94abc1cf1976171731a1ba67596def3cb0652d08e1e3af3235cf7c0a610f +SHA512 (5.4.1.tar.gz) = 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997 From dbdf72c1685b92f027b0b9701e8e6bcc3541e555 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 22:38:47 +0000 Subject: [PATCH 115/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index e548a17..55e4376 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 5.4.1 -Release: 1%{?dist} +Release: 2%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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) From f8511d186daa9001ba616721f631966d913a8503 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 20:47:19 +0200 Subject: [PATCH 116/153] Rebuilt for Python 3.10 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 55e4376..610c7ff 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 5.4.1 -Release: 2%{?dist} +Release: 3%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From dffce05c6684ecf411cd76933bed7dace20bbf4b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 11:07:49 +0000 Subject: [PATCH 117/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 05b1372f6404f8d2769d00b1afb2f7ff42ea30b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 16:02:20 +0000 Subject: [PATCH 118/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 610c7ff..58a3333 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 5.4.1 -Release: 3%{?dist} +Release: 4%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From aa56f353fcefa98c47d9e30c67ca53004e4f3191 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 4 Oct 2021 16:21:39 -0400 Subject: [PATCH 119/153] New upstream beta release 6.0b1 (rhbz#2010501) --- .gitignore | 1 + PyYAML.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 58b2104..0179e3b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ PyYAML-3.09.tar.gz /5.4b2.tar.gz /5.4.tar.gz /5.4.1.tar.gz +/6.0b1.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index 58a3333..da09f82 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,9 +6,9 @@ %endif Name: PyYAML -Version: 5.4.1 -Release: 4%{?dist} -%global uversion %{version} +Version: 6.0 +Release: 0.1.b1%{?dist} +%global uversion %{version}b1 Summary: YAML parser and emitter for Python License: MIT @@ -105,17 +105,20 @@ rm -rf ext/_yaml.c %if %{with python2} %files -n python2-pyyaml %license LICENSE -%doc CHANGES README examples +%doc CHANGES README.md examples %{python2_sitearch}/* %endif %files -n python3-pyyaml %license LICENSE -%doc CHANGES README examples +%doc CHANGES README.md examples %{python3_sitearch}/* %changelog +* 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 diff --git a/sources b/sources index 9893b64..91eec19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.4.1.tar.gz) = 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997 +SHA512 (6.0b1.tar.gz) = fd63d733c825d018c4d0638cf1c78058be77d4ffe8dc2bb7acf0d0d93a17b2bd88a89b6464be70866ae4ad4457b8f5dd4ceb56b84bf876e9ef1086e9d7325bb0 From a3b16d60e5c72f713be129f05661cc5e97b6fbbc Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 13 Oct 2021 15:56:27 -0400 Subject: [PATCH 120/153] New upstream release 6.0 --- .gitignore | 1 + PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0179e3b..10d0cd6 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ PyYAML-3.09.tar.gz /5.4.tar.gz /5.4.1.tar.gz /6.0b1.tar.gz +/6.0.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index da09f82..0d3a123 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,8 +7,8 @@ Name: PyYAML Version: 6.0 -Release: 0.1.b1%{?dist} -%global uversion %{version}b1 +Release: 1%{?dist} +%global uversion %{version} Summary: YAML parser and emitter for Python License: MIT @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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) diff --git a/sources b/sources index 91eec19..915b17b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.0b1.tar.gz) = fd63d733c825d018c4d0638cf1c78058be77d4ffe8dc2bb7acf0d0d93a17b2bd88a89b6464be70866ae4ad4457b8f5dd4ceb56b84bf876e9ef1086e9d7325bb0 +SHA512 (6.0.tar.gz) = cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad From eb28f913edc5778dd79fb8f6879bca245114f038 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 19:37:44 +0000 Subject: [PATCH 121/153] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 0d3a123..32e6da8 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0 -Release: 1%{?dist} +Release: 2%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -116,6 +116,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From 5fa165ab820fd62b38f3e60ce0283d1dc5ff03ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 8 Feb 2022 11:42:23 +0100 Subject: [PATCH 122/153] Use %py_provides, drop old Obsoletes --- PyYAML.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 32e6da8..6060e18 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0 -Release: 2%{?dist} +Release: 3%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -60,13 +60,8 @@ Provides: PyYAML%{?_isa} = %{version}-%{release} %package -n python3-pyyaml Summary: %summary -Provides: python3-yaml = %{version}-%{release} -Provides: python3-yaml%{?_isa} = %{version}-%{release} -%{?python_provide:%python_provide python3-pyyaml} -# Remove before F31 -Provides: python3-PyYAML = %{version}-%{release} -Provides: python3-PyYAML%{?_isa} = %{version}-%{release} -Obsoletes: python3-PyYAML < 4.1-5 +%py_provides python3-yaml +%py_provides python3-PyYAML %description -n python3-pyyaml %_description @@ -116,6 +111,10 @@ rm -rf ext/_yaml.c %changelog +* 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 From 541b01a40c8a827525e6274dc60f6d69a79707f0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 16:02:54 +0200 Subject: [PATCH 123/153] Rebuilt for Python 3.11 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 6060e18..900e00e 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0 -Release: 3%{?dist} +Release: 4%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -111,6 +111,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From 5a504b53fcfe716bdab7d3188b3be29a30ce0ccd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 18:59:25 +0000 Subject: [PATCH 124/153] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 900e00e..4fc0412 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0 -Release: 4%{?dist} +Release: 5%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -111,6 +111,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From aedb9b9971a4e21b14fcb9b2ff4b403e9497372a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 20:03:22 +0000 Subject: [PATCH 125/153] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 4fc0412..7f24be5 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0 -Release: 5%{?dist} +Release: 6%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -111,6 +111,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From 7a2566e921817430638d324d7630b8182d3a51c2 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 11 Apr 2023 09:44:32 -0400 Subject: [PATCH 126/153] Rebuilt for Python 3.12 / Cython 0.29.34 (rhbz#2177815) --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7f24be5..c76023a 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0 -Release: 6%{?dist} +Release: 7%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -111,6 +111,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From cbe197de57add092e7f27474de057d61a9e7fb36 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 21:37:36 +0200 Subject: [PATCH 127/153] Rebuilt for Python 3.12 --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index c76023a..f7ccd0f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0 -Release: 7%{?dist} +Release: 8%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -111,6 +111,9 @@ rm -rf ext/_yaml.c %changelog +* 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) From f0372c44e6b360268cd1bc5393b0ecea3f282b0a Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 18 Jul 2023 09:35:05 -0400 Subject: [PATCH 128/153] New upstream release 6.0.1 (rhbz#2223462) --- .gitignore | 1 + PyYAML.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 10d0cd6..eea8f48 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ PyYAML-3.09.tar.gz /5.4.1.tar.gz /6.0b1.tar.gz /6.0.tar.gz +/6.0.1.tar.gz diff --git a/PyYAML.spec b/PyYAML.spec index f7ccd0f..9d5aeeb 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -6,8 +6,8 @@ %endif Name: PyYAML -Version: 6.0 -Release: 8%{?dist} +Version: 6.0.1 +Release: 1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -111,6 +111,9 @@ rm -rf ext/_yaml.c %changelog +* 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 diff --git a/sources b/sources index 915b17b..e041a66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.0.tar.gz) = cbcacc3560a035e2082867e93a9733f8660ea4c7f60573d07642f33a5453dcdc88d67299c3bcb97c27b843202a45d40de7444eb5e815bd4955129c9fc8ae04ad +SHA512 (6.0.1.tar.gz) = 1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0 From 63494f787502e0da82d4d9f3573df4858d7416c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 11:24:53 +0000 Subject: [PATCH 129/153] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- PyYAML.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 9d5aeeb..4ed1914 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0.1 -Release: 1%{?dist} +Release: 2%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -111,6 +111,9 @@ rm -rf ext/_yaml.c %changelog +* 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) From 65ff977efa57810e66763fc30fe88bb141d2c7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 25 Jul 2023 13:57:46 +0200 Subject: [PATCH 130/153] Pin Cython < 3 to build this package --- PyYAML.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 4ed1914..c6a3324 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0.1 -Release: 2%{?dist} +Release: 3%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -25,7 +25,8 @@ BuildRequires: python2-setuptools BuildRequires: python3-devel BuildRequires: python3-setuptools -BuildRequires: python3-Cython +# This requires cython 0.29, see https://github.com/yaml/pyyaml/issues/601 +BuildRequires: python3-cython < 3 %global _description\ @@ -111,6 +112,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From fae3da3392270ed97c96a39db5028efd88a262cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Jul 2023 11:16:57 +0200 Subject: [PATCH 131/153] Fix build with Cython 3 --- 731.patch | 39 +++++++++++++++++++++++++++++++++++++++ PyYAML.spec | 14 ++++++++++---- 2 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 731.patch diff --git a/731.patch b/731.patch new file mode 100644 index 0000000..4c924f4 --- /dev/null +++ b/731.patch @@ -0,0 +1,39 @@ +From 17dc5b6cd96dcfe64fd71789c771ca9b96d260e5 Mon Sep 17 00:00:00 2001 +From: "Andrew J. Hesford" +Date: Fri, 21 Jul 2023 09:50:00 -0400 +Subject: [PATCH] Fix builds with Cython 3 + +This is a *de minimis* fix for building with Cython 3. Recent Cython<3 +releases provided `Cython.Distutils.build_ext` as an alias to +`Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this +alias and instead uses a wholly new `Cython.Distutils.build_ext` that +does not provide the `cython_sources` function used in `setup.py`. + +Explicitly importing `old_build_ext` preserves the existing behavior for +recent Cython<3 and uses the correct behavior for Cython 3. Should the +import fail (*e.g.*, because the version of Cython available predates +the availability of `old_build_ext`), the import falls back to just +`Cython.Distutils.build_ext`. + +Signed-off-by: Andrew J. Hesford +--- + setup.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 944e7fa2..462b1e95 100644 +--- a/setup.py ++++ b/setup.py +@@ -82,7 +82,11 @@ + with_cython = True + try: + from Cython.Distutils.extension import Extension as _Extension +- from Cython.Distutils import build_ext as _build_ext ++ try: ++ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext ++ except ImportError: ++ from Cython.Distutils import build_ext as _build_ext ++ + with_cython = True + except ImportError: + if with_cython: diff --git a/PyYAML.spec b/PyYAML.spec index c6a3324..7e86c2e 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -7,7 +7,7 @@ Name: PyYAML Version: 6.0.1 -Release: 3%{?dist} +Release: 4%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python @@ -15,6 +15,10 @@ License: MIT URL: https://github.com/yaml/pyyaml Source0: https://github.com/yaml/pyyaml/archive/%{uversion}.tar.gz +# Fix build with Cython 3 +# Proposed upstream but refused (upstream does not want Cython 3) +Patch: https://github.com/yaml/pyyaml/pull/731.patch + BuildRequires: gcc BuildRequires: libyaml-devel @@ -25,8 +29,7 @@ BuildRequires: python2-setuptools BuildRequires: python3-devel BuildRequires: python3-setuptools -# This requires cython 0.29, see https://github.com/yaml/pyyaml/issues/601 -BuildRequires: python3-cython < 3 +BuildRequires: python3-cython %global _description\ @@ -68,7 +71,7 @@ Summary: %summary %prep -%setup -q -n pyyaml-%{uversion} +%autosetup -p1 -n pyyaml-%{uversion} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -112,6 +115,9 @@ rm -rf ext/_yaml.c %changelog +* 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 From b6924f67a24bac96ff81d356c83cae27c6392ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Jul 2023 13:48:08 +0200 Subject: [PATCH 132/153] Remove python2 bits from the specfile --- PyYAML.spec | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index 7e86c2e..ca695c7 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,10 +1,3 @@ -# Python 2 removal, RHBZ#1775075 -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 -%bcond_with python2 -%else -%bcond_without python2 -%endif - Name: PyYAML Version: 6.0.1 Release: 4%{?dist} @@ -22,11 +15,6 @@ Patch: https://github.com/yaml/pyyaml/pull/731.patch BuildRequires: gcc BuildRequires: libyaml-devel -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-setuptools -%endif - BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: python3-cython @@ -48,20 +36,6 @@ configuration files to object serialization and persistence. %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} - -%description -n python2-pyyaml %_description -%endif - %package -n python3-pyyaml Summary: %summary %py_provides python3-yaml @@ -81,33 +55,15 @@ 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 python2-pyyaml -%license LICENSE -%doc CHANGES README.md examples -%{python2_sitearch}/* -%endif - %files -n python3-pyyaml %license LICENSE %doc CHANGES README.md examples From 8e45866841489cf25857c6269954a54878ac7b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Jul 2023 13:48:50 +0200 Subject: [PATCH 133/153] Remove redundant %uversion macro from the specfile --- PyYAML.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index ca695c7..52ad890 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,12 +1,11 @@ Name: PyYAML Version: 6.0.1 Release: 4%{?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 # Fix build with Cython 3 # Proposed upstream but refused (upstream does not want Cython 3) @@ -45,7 +44,7 @@ Summary: %summary %prep -%autosetup -p1 -n pyyaml-%{uversion} +%autosetup -p1 -n pyyaml-%{version} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file From 1493e133ad3f58f0f8466c638577ffce448ee9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Jul 2023 13:49:14 +0200 Subject: [PATCH 134/153] Don't needlessly enumerate the single Source --- PyYAML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 52ad890..05ba05f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -5,7 +5,7 @@ Summary: YAML parser and emitter for Python License: MIT URL: https://github.com/yaml/pyyaml -Source0: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz +Source: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz # Fix build with Cython 3 # Proposed upstream but refused (upstream does not want Cython 3) From c9a5b742075cb5ff5104359be289466d0197f132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Jul 2023 13:51:15 +0200 Subject: [PATCH 135/153] Be more explicit in %files See https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_explicit_lists --- PyYAML.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index 05ba05f..d0bbb52 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -66,7 +66,9 @@ rm -rf ext/_yaml.c %files -n python3-pyyaml %license LICENSE %doc CHANGES README.md examples -%{python3_sitearch}/* +%{python3_sitearch}/yaml/ +%{python3_sitearch}/_yaml/ +%{python3_sitearch}/PyYAML-*.egg-info/ %changelog From 4068994faa71c585291f938c6007f89fe60133bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Jul 2023 13:56:03 +0200 Subject: [PATCH 136/153] Use the pyproject macros --- PyYAML.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/PyYAML.spec b/PyYAML.spec index d0bbb52..f808591 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -13,10 +13,7 @@ Patch: https://github.com/yaml/pyyaml/pull/731.patch BuildRequires: gcc BuildRequires: libyaml-devel - BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-cython %global _description\ @@ -50,25 +47,29 @@ chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file rm -rf ext/_yaml.c +# we have a patch for Cython 3 +sed -i 's/Cython<3.0/Cython/' pyproject.toml + + +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files yaml _yaml %check %{__python3} setup.py test -%files -n python3-pyyaml -%license LICENSE +%files -n python3-pyyaml -f %{pyproject_files} %doc CHANGES README.md examples -%{python3_sitearch}/yaml/ -%{python3_sitearch}/_yaml/ -%{python3_sitearch}/PyYAML-*.egg-info/ %changelog From 28a2e37106d3a05646a1e87738f6585a566bf785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Jul 2023 13:57:58 +0200 Subject: [PATCH 137/153] Avoid the deprecated `python3 setup.py test` command --- PyYAML.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyYAML.spec b/PyYAML.spec index f808591..c9b69c5 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -65,7 +65,7 @@ sed -i 's/Cython<3.0/Cython/' pyproject.toml %check -%{__python3} setup.py test +%{py3_test_envvars} %{python3} tests/lib/test_all.py %files -n python3-pyyaml -f %{pyproject_files} From 393e7edc11bcf00282ac5a8e1dbd28bc0982dcaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 28 Jul 2023 13:59:07 +0200 Subject: [PATCH 138/153] Convert to %autorelease and %autochangelog [skip changelog] --- PyYAML.spec | 308 +--------------------------------------------------- changelog | 305 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 307 insertions(+), 306 deletions(-) create mode 100644 changelog diff --git a/PyYAML.spec b/PyYAML.spec index c9b69c5..b0e9800 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,6 +1,6 @@ Name: PyYAML Version: 6.0.1 -Release: 4%{?dist} +Release: %autorelease Summary: YAML parser and emitter for Python License: MIT @@ -73,308 +73,4 @@ sed -i 's/Cython<3.0/Cython/' pyproject.toml %changelog -* 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 +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..bb0e538 --- /dev/null +++ b/changelog @@ -0,0 +1,305 @@ +* 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 From bcfb1cb86e72a8aeeb5f104b994cbaf695232f81 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Thu, 10 Aug 2023 13:38:17 +0200 Subject: [PATCH 139/153] Declare the license as an SPDX expression --- PyYAML.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/PyYAML.spec b/PyYAML.spec index b0e9800..ead210f 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -3,6 +3,7 @@ Version: 6.0.1 Release: %autorelease Summary: YAML parser and emitter for Python +# SPDX License: MIT URL: https://github.com/yaml/pyyaml Source: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz From dddf41e8cf5fddc89adfafbe55d71c366c083673 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 10:17:43 +0000 Subject: [PATCH 140/153] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a32a024c189290cc7671a975c46fbb0f0e9d3728 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 21:13:13 +0000 Subject: [PATCH 141/153] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 26b6c3301124d153cda957a92f4ca930d8b983fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20=C5=A0igut?= Date: Thu, 11 Apr 2024 12:38:58 +0200 Subject: [PATCH 142/153] Import CI tests from RHEL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is from RHEL distgit tests/PyYAML, directory Sanity/Smoke. The original commit hash: fd668cd6d20ca9c46d9bfa5ccf34f3a925317b25 Only necessary files were kept. Co-Authored-By: Lukas Zachar Co-Authored-By: Miro Hrončok --- .fmf/version | 1 + plan.fmf | 4 ++ tests/smoke/main.fmf | 5 +++ tests/smoke/pyyaml_dump.py | 3 ++ tests/smoke/pyyaml_load.py | 13 ++++++ tests/smoke/pyyaml_object.py | 24 ++++++++++ tests/smoke/pyyaml_parse.py | 9 ++++ tests/smoke/runtest.sh | 86 ++++++++++++++++++++++++++++++++++++ 8 files changed, 145 insertions(+) create mode 100644 .fmf/version create mode 100644 plan.fmf create mode 100644 tests/smoke/main.fmf create mode 100644 tests/smoke/pyyaml_dump.py create mode 100644 tests/smoke/pyyaml_load.py create mode 100644 tests/smoke/pyyaml_object.py create mode 100644 tests/smoke/pyyaml_parse.py create mode 100755 tests/smoke/runtest.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plan.fmf b/plan.fmf new file mode 100644 index 0000000..e6427de --- /dev/null +++ b/plan.fmf @@ -0,0 +1,4 @@ +discover: + how: fmf +execute: + how: tmt diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf new file mode 100644 index 0000000..7d9c513 --- /dev/null +++ b/tests/smoke/main.fmf @@ -0,0 +1,5 @@ +test: ./runtest.sh +framework: beakerlib +require: + - python3-pyyaml +duration: 5m diff --git a/tests/smoke/pyyaml_dump.py b/tests/smoke/pyyaml_dump.py new file mode 100644 index 0000000..a6f4a6d --- /dev/null +++ b/tests/smoke/pyyaml_dump.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python +import yaml +print(yaml.dump({'name': 'Silenthand Olleander', 'race': 'Human', 'traits': ['ONE_HAND', 'ONE_EYE']})) diff --git a/tests/smoke/pyyaml_load.py b/tests/smoke/pyyaml_load.py new file mode 100644 index 0000000..6bf48f2 --- /dev/null +++ b/tests/smoke/pyyaml_load.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python +import yaml +documents = """ +--- +name: foo +--- +name: bar +--- +name: foobar +""" + +for data in yaml.load_all(documents, Loader=yaml.SafeLoader): + print(data) diff --git a/tests/smoke/pyyaml_object.py b/tests/smoke/pyyaml_object.py new file mode 100644 index 0000000..b689c05 --- /dev/null +++ b/tests/smoke/pyyaml_object.py @@ -0,0 +1,24 @@ +import yaml +class Hero: + def __init__(self, name, hp, sp): + self.name = name + self.hp = hp + self.sp = sp + def __repr__(self): + return "%s(name=%r, hp=%r, sp=%r)" % ( + self.__class__.__name__, self.name, self.hp, self.sp) + +STRING = """ +!!python/object:__main__.Hero +name: Welthyr Syxgon +hp: 1200 +sp: 0 +""" + +try: + yaml.load(STRING, Loader=yaml.SafeLoader) + raise RuntimeError("Didn't raise exception") +except yaml.constructor.ConstructorError: + pass + +print(yaml.unsafe_load(STRING)) diff --git a/tests/smoke/pyyaml_parse.py b/tests/smoke/pyyaml_parse.py new file mode 100644 index 0000000..3850b78 --- /dev/null +++ b/tests/smoke/pyyaml_parse.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python +import yaml +document = """ + a: 1 + b: + c: 3 + d: 4 +""" +print(yaml.dump(yaml.load(document, Loader=yaml.SafeLoader))) diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh new file mode 100755 index 0000000..cef0e09 --- /dev/null +++ b/tests/smoke/runtest.sh @@ -0,0 +1,86 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/PyYAML/Sanity/Smoke +# Description: Smoke test for this component +# Author: Stepan Sigut +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2016 Red Hat, Inc. +# +# This program is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see http://www.gnu.org/licenses/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include Beaker environment +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGES=${PACKAGES:-"python3 python3-pyyaml"} +PYTHON=${PYTHON:-"python3"} + +PATTERN1="{'name': 'foo'} +{'name': 'bar'} +{'name': 'foobar'}" +PATTERN3="name: Silenthand Olleander +race: Human +traits: [ONE_HAND, ONE_EYE]" +PATTERN4="a: 1 +b: {c: 3, d: 4}" +PATTERN5="Hero(name='Welthyr Syxgon', hp=1200, sp=0)" + + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm --all + set -o pipefail + rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" + + # export python's MAJOR and MINOR version + rlRun "export $($PYTHON -c \ + 'import sys; print("MAJOR={0} MINOR={1}".format(\ + sys.version_info[0],sys.version_info[1]))')" + rlRun "cp py* $TmpDir" + rlRun "pushd $TmpDir" + + rlPhaseEnd + + rlPhaseStartTest "Running pyyaml_load.py" + rlRun "$PYTHON pyyaml_load.py | tee dump.log" 0 + rlAssertGrep "$PATTERN1" "dump.log" + rlPhaseEnd + + rlPhaseStartTest "Running pyyaml_dump.py" + rlRun "$PYTHON pyyaml_dump.py | tee dump.log" 0 + rlAssertGrep "$PATTERN3" "dump.log" + rlPhaseEnd + + rlPhaseStartTest "Running pyyaml_parse.py" + rlRun "$PYTHON pyyaml_parse.py | tee dump.log" 0 + rlAssertGrep "$PATTERN4" "dump.log" + rlPhaseEnd + + rlPhaseStartTest "Running pyyaml_object.py" + rlRun "$PYTHON pyyaml_object.py | tee dump.log" 0 + rlAssertGrep "$PATTERN5" "dump.log" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd + +rlJournalPrintText +rlJournalEnd From b487804eb8c881857d55932d76a87bb9accf9ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zachar?= Date: Thu, 11 Apr 2024 15:51:18 +0200 Subject: [PATCH 143/153] CI: Modernize runtest.sh --- tests/smoke/runtest.sh | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh index cef0e09..72451ed 100755 --- a/tests/smoke/runtest.sh +++ b/tests/smoke/runtest.sh @@ -28,7 +28,6 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 -PACKAGES=${PACKAGES:-"python3 python3-pyyaml"} PYTHON=${PYTHON:-"python3"} PATTERN1="{'name': 'foo'} @@ -41,45 +40,34 @@ PATTERN4="a: 1 b: {c: 3, d: 4}" PATTERN5="Hero(name='Welthyr Syxgon', hp=1200, sp=0)" +set -o pipefail rlJournalStart rlPhaseStartSetup - rlAssertRpm --all - set -o pipefail - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - # export python's MAJOR and MINOR version rlRun "export $($PYTHON -c \ 'import sys; print("MAJOR={0} MINOR={1}".format(\ sys.version_info[0],sys.version_info[1]))')" - rlRun "cp py* $TmpDir" - rlRun "pushd $TmpDir" - rlPhaseEnd rlPhaseStartTest "Running pyyaml_load.py" - rlRun "$PYTHON pyyaml_load.py | tee dump.log" 0 - rlAssertGrep "$PATTERN1" "dump.log" + rlRun -s "$PYTHON pyyaml_load.py" + rlAssertGrep "$PATTERN1" "$rlRun_LOG" rlPhaseEnd rlPhaseStartTest "Running pyyaml_dump.py" - rlRun "$PYTHON pyyaml_dump.py | tee dump.log" 0 - rlAssertGrep "$PATTERN3" "dump.log" + rlRun -s "$PYTHON pyyaml_dump.py" + rlAssertGrep "$PATTERN3" "$rlRun_LOG" rlPhaseEnd rlPhaseStartTest "Running pyyaml_parse.py" - rlRun "$PYTHON pyyaml_parse.py | tee dump.log" 0 - rlAssertGrep "$PATTERN4" "dump.log" + rlRun -s "$PYTHON pyyaml_parse.py" + rlAssertGrep "$PATTERN4" "$rlRun_LOG" rlPhaseEnd rlPhaseStartTest "Running pyyaml_object.py" - rlRun "$PYTHON pyyaml_object.py | tee dump.log" 0 - rlAssertGrep "$PATTERN5" "dump.log" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlRun -s "$PYTHON pyyaml_object.py" + rlAssertGrep "$PATTERN5" "$rlRun_LOG" rlPhaseEnd rlJournalPrintText From 548d13b4068fd59005398a38e188776140885ae0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:50:57 +0200 Subject: [PATCH 144/153] Rebuilt for Python 3.13 From a483094a536c70451bcb57e2715a7e44ea6e85db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 15:09:13 +0000 Subject: [PATCH 145/153] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b879627e2a8f18c7f69b30a82001683943827501 Mon Sep 17 00:00:00 2001 From: Jonathan Wright Date: Tue, 31 Dec 2024 15:11:10 -0600 Subject: [PATCH 146/153] update to 6.0.2 --- .gitignore | 1 + 731.patch | 39 --------------------------------------- PyYAML.spec | 12 +++--------- sources | 2 +- 4 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 731.patch diff --git a/.gitignore b/.gitignore index eea8f48..2f06b37 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ PyYAML-3.09.tar.gz /6.0b1.tar.gz /6.0.tar.gz /6.0.1.tar.gz +/6.0.2.tar.gz diff --git a/731.patch b/731.patch deleted file mode 100644 index 4c924f4..0000000 --- a/731.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 17dc5b6cd96dcfe64fd71789c771ca9b96d260e5 Mon Sep 17 00:00:00 2001 -From: "Andrew J. Hesford" -Date: Fri, 21 Jul 2023 09:50:00 -0400 -Subject: [PATCH] Fix builds with Cython 3 - -This is a *de minimis* fix for building with Cython 3. Recent Cython<3 -releases provided `Cython.Distutils.build_ext` as an alias to -`Cython.Distutils.old_build_ext.old_build_ext`; Cython 3 drops this -alias and instead uses a wholly new `Cython.Distutils.build_ext` that -does not provide the `cython_sources` function used in `setup.py`. - -Explicitly importing `old_build_ext` preserves the existing behavior for -recent Cython<3 and uses the correct behavior for Cython 3. Should the -import fail (*e.g.*, because the version of Cython available predates -the availability of `old_build_ext`), the import falls back to just -`Cython.Distutils.build_ext`. - -Signed-off-by: Andrew J. Hesford ---- - setup.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 944e7fa2..462b1e95 100644 ---- a/setup.py -+++ b/setup.py -@@ -82,7 +82,11 @@ - with_cython = True - try: - from Cython.Distutils.extension import Extension as _Extension -- from Cython.Distutils import build_ext as _build_ext -+ try: -+ from Cython.Distutils.old_build_ext import old_build_ext as _build_ext -+ except ImportError: -+ from Cython.Distutils import build_ext as _build_ext -+ - with_cython = True - except ImportError: - if with_cython: diff --git a/PyYAML.spec b/PyYAML.spec index ead210f..3aaece1 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,5 +1,5 @@ Name: PyYAML -Version: 6.0.1 +Version: 6.0.2 Release: %autorelease Summary: YAML parser and emitter for Python @@ -8,13 +8,10 @@ License: MIT URL: https://github.com/yaml/pyyaml Source: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz -# Fix build with Cython 3 -# Proposed upstream but refused (upstream does not want Cython 3) -Patch: https://github.com/yaml/pyyaml/pull/731.patch - BuildRequires: gcc BuildRequires: libyaml-devel BuildRequires: python3-devel +BuildRequires: python3-pytest %global _description\ @@ -48,9 +45,6 @@ chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file rm -rf ext/_yaml.c -# we have a patch for Cython 3 -sed -i 's/Cython<3.0/Cython/' pyproject.toml - %generate_buildrequires %pyproject_buildrequires @@ -66,7 +60,7 @@ sed -i 's/Cython<3.0/Cython/' pyproject.toml %check -%{py3_test_envvars} %{python3} tests/lib/test_all.py +%pytest %files -n python3-pyyaml -f %{pyproject_files} diff --git a/sources b/sources index e041a66..2695170 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.0.1.tar.gz) = 1c74a92a4ad7d47854dc7bcb2e89b3c8e0b14fa815c7dbfbc22b24480dbba6c81e971c77ee384c494a960914b95f06edf943d7431925a5ed674a0ba830d258e0 +SHA512 (6.0.2.tar.gz) = c72665131296762521d9ae4fc1c8619946f46ea16ad98b6b8e995828f2cdbd1ed61741fc2d646753f71d95a352b36562a1302f0cb646d5705652cd24b2f10b16 From bc3aaf960794d69474b85260faa0378dab44680f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 08:55:12 +0000 Subject: [PATCH 147/153] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1a65ed40195eea94f425c3b66e8e820e40322b29 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 22:53:19 +0200 Subject: [PATCH 148/153] Rebuilt for Python 3.14 From 53e5626e58a74f7a48fa4d74c6d1ae9e71785dd2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 15:56:40 +0000 Subject: [PATCH 149/153] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b879ba0bb0a239c854a3150cff42259d1a2740f5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:14:28 +0200 Subject: [PATCH 150/153] Rebuilt for Python 3.14.0rc2 bytecode From 072a6204e15c201b341912abb10e6e471f0b683c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 27 Aug 2025 13:06:26 +0200 Subject: [PATCH 151/153] Drop unneeded build dependency on python3-wheel Motivated by https://github.com/fedora-eln/eln/issues/284 --- 823.patch | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ PyYAML.spec | 3 +++ 2 files changed, 59 insertions(+) create mode 100644 823.patch diff --git a/823.patch b/823.patch new file mode 100644 index 0000000..a0c3f29 --- /dev/null +++ b/823.patch @@ -0,0 +1,56 @@ +From 74e0c6ccc615fa38ee793899ca80f3351c10c60e Mon Sep 17 00:00:00 2001 +From: Henry Schreiner +Date: Tue, 13 Aug 2024 09:48:48 -0400 +Subject: [PATCH 1/2] fix: bdist_wheel was unmodified + +--- + setup.py | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/setup.py b/setup.py +index 8040320fe..72018345c 100644 +--- a/setup.py ++++ b/setup.py +@@ -93,11 +93,6 @@ + if with_cython: + raise + +-try: +- from wheel.bdist_wheel import bdist_wheel +-except ImportError: +- bdist_wheel = None +- + + try: + from _pyyaml_pep517 import ActiveConfigSettings +@@ -325,8 +320,6 @@ def run(self): + 'build_ext': build_ext, + 'test': test, + } +-if bdist_wheel: +- cmdclass['bdist_wheel'] = bdist_wheel + + + if __name__ == '__main__': + +From bdc81567884bedab456f62ccfd3c1ec800c57e36 Mon Sep 17 00:00:00 2001 +From: Henry Schreiner +Date: Tue, 13 Aug 2024 09:50:19 -0400 +Subject: [PATCH 2/2] Update pyproject.toml + +--- + pyproject.toml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index d8e5b9695..00ce069c6 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,6 @@ + [build-system] + requires = [ + "setuptools", # FIXME: declare min/max setuptools versions? +- "wheel", + "Cython; python_version < '3.13'", + "Cython>=3.0; python_version >= '3.13'" + ] diff --git a/PyYAML.spec b/PyYAML.spec index 3aaece1..37b0c47 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -8,6 +8,9 @@ License: MIT URL: https://github.com/yaml/pyyaml Source: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz +# Drop unneeded build dependency on python3-wheel +Patch: https://github.com/yaml/pyyaml/pull/823.patch + BuildRequires: gcc BuildRequires: libyaml-devel BuildRequires: python3-devel From 0437d4abe670382249ac506ff9f8a4215c384b08 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:51:38 +0200 Subject: [PATCH 152/153] Rebuilt for Python 3.14.0rc3 bytecode From f3965c2bb39376e90d69443ca3864fa9bb9f8e77 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Tue, 30 Sep 2025 09:38:23 -0400 Subject: [PATCH 153/153] New upstream release 6.0.3 Resolves: rhbz#2398910 --- .gitignore | 1 + 823.patch | 56 ----------------------------------------------------- PyYAML.spec | 5 +---- sources | 2 +- 4 files changed, 3 insertions(+), 61 deletions(-) delete mode 100644 823.patch diff --git a/.gitignore b/.gitignore index 2f06b37..1966257 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ PyYAML-3.09.tar.gz /6.0.tar.gz /6.0.1.tar.gz /6.0.2.tar.gz +/6.0.3.tar.gz diff --git a/823.patch b/823.patch deleted file mode 100644 index a0c3f29..0000000 --- a/823.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 74e0c6ccc615fa38ee793899ca80f3351c10c60e Mon Sep 17 00:00:00 2001 -From: Henry Schreiner -Date: Tue, 13 Aug 2024 09:48:48 -0400 -Subject: [PATCH 1/2] fix: bdist_wheel was unmodified - ---- - setup.py | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/setup.py b/setup.py -index 8040320fe..72018345c 100644 ---- a/setup.py -+++ b/setup.py -@@ -93,11 +93,6 @@ - if with_cython: - raise - --try: -- from wheel.bdist_wheel import bdist_wheel --except ImportError: -- bdist_wheel = None -- - - try: - from _pyyaml_pep517 import ActiveConfigSettings -@@ -325,8 +320,6 @@ def run(self): - 'build_ext': build_ext, - 'test': test, - } --if bdist_wheel: -- cmdclass['bdist_wheel'] = bdist_wheel - - - if __name__ == '__main__': - -From bdc81567884bedab456f62ccfd3c1ec800c57e36 Mon Sep 17 00:00:00 2001 -From: Henry Schreiner -Date: Tue, 13 Aug 2024 09:50:19 -0400 -Subject: [PATCH 2/2] Update pyproject.toml - ---- - pyproject.toml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index d8e5b9695..00ce069c6 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,7 +1,6 @@ - [build-system] - requires = [ - "setuptools", # FIXME: declare min/max setuptools versions? -- "wheel", - "Cython; python_version < '3.13'", - "Cython>=3.0; python_version >= '3.13'" - ] diff --git a/PyYAML.spec b/PyYAML.spec index 37b0c47..8cb2438 100644 --- a/PyYAML.spec +++ b/PyYAML.spec @@ -1,5 +1,5 @@ Name: PyYAML -Version: 6.0.2 +Version: 6.0.3 Release: %autorelease Summary: YAML parser and emitter for Python @@ -8,9 +8,6 @@ License: MIT URL: https://github.com/yaml/pyyaml Source: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz -# Drop unneeded build dependency on python3-wheel -Patch: https://github.com/yaml/pyyaml/pull/823.patch - BuildRequires: gcc BuildRequires: libyaml-devel BuildRequires: python3-devel diff --git a/sources b/sources index 2695170..b7b81fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (6.0.2.tar.gz) = c72665131296762521d9ae4fc1c8619946f46ea16ad98b6b8e995828f2cdbd1ed61741fc2d646753f71d95a352b36562a1302f0cb646d5705652cd24b2f10b16 +SHA512 (6.0.3.tar.gz) = a0da43e32d127409ad61b11dc1d733b2e9c743977b3d72c05c81fc2ab183b40bc284452b0874dbeae1a736e1cd4a34f0df641ceefd5e9df38b3e53155fc5f633