From 9abd7fefa2a380d48e54c4cda24620b2188bbae1 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Mon, 18 May 2020 09:31:51 -0400 Subject: [PATCH 01/47] 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 02/47] 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 03/47] - 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 04/47] 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 05/47] 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 06/47] 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 07/47] 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 08/47] 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 09/47] - 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 10/47] 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 11/47] - 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 12/47] - 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 13/47] 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 14/47] 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 15/47] - 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 16/47] 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 17/47] 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 18/47] 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 19/47] 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 20/47] 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 21/47] 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 22/47] 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 23/47] 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 24/47] 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 25/47] 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 26/47] 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 27/47] 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 28/47] 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 29/47] 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 30/47] 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 31/47] 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 32/47] 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 33/47] 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 34/47] 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 35/47] 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 36/47] 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 37/47] 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 38/47] 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 39/47] 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 40/47] 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 41/47] 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 42/47] 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 43/47] 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 44/47] 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 45/47] 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 46/47] 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 47/47] 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