From 00ffc0c1a2fe2f31ef4e3bd7d17be57473e89c09 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 08:36:15 +0000 Subject: [PATCH 01/79] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 63fce02..27931fc 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.10.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/dcantrell/%{name} @@ -90,6 +90,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 1:3.10.7-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Thu Feb 04 2016 Fedora Release Engineering - 1:3.10.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From e4a911823968b15b1d5e1c15231025214d1590a5 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 13 Dec 2016 01:28:41 +0100 Subject: [PATCH 02/79] Rebuild for Python 3.6 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 27931fc..cd139d4 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.10.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/dcantrell/%{name} @@ -90,6 +90,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Dec 13 2016 Stratakis Charalampos - 1:3.10.7-5 +- rebuilt + * Tue Jul 19 2016 Fedora Release Engineering - 1:3.10.7-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From e9a00b12d9da661ef10441fcbcc1b7e5a20bd218 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 13 Dec 2016 15:22:59 +0100 Subject: [PATCH 03/79] Fix previous changelog's entry --- pyparted.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index cd139d4..e47b0b4 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -91,7 +91,7 @@ rm -rf %{buildroot} %changelog * Tue Dec 13 2016 Stratakis Charalampos - 1:3.10.7-5 -- rebuilt +- Rebuild for Python 3.6 * Tue Jul 19 2016 Fedora Release Engineering - 1:3.10.7-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From 6741677a7ac3774043ee64f062801bd64609cc95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 08:08:37 +0000 Subject: [PATCH 04/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index e47b0b4..2de5247 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.10.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/dcantrell/%{name} @@ -90,6 +90,9 @@ rm -rf %{buildroot} %endif %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1:3.10.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Dec 13 2016 Stratakis Charalampos - 1:3.10.7-5 - Rebuild for Python 3.6 From 023abd7282b2c9660dcb0bd651834eda48c622a2 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 22 Jun 2017 17:26:14 -0400 Subject: [PATCH 05/79] Upgrade to pyparted-3.11.0 --- .gitignore | 1 + pyparted.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6911680..edda747 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /pyparted-3.10.6.tar.gz /pyparted-3.10.7.tar.gz +/pyparted-3.11.0.tar.gz diff --git a/pyparted.spec b/pyparted.spec index 2de5247..6a5b350 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -3,13 +3,13 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 -Version: 3.10.7 -Release: 6%{?dist} +Version: 3.11.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries -URL: https://github.com/dcantrell/%{name} +URL: https://github.com/rhinstaller/pyparted -Source0: https://github.com/dcantrell/%{name}/releases/%{name}-%{version}.tar.gz +Source0: https://github.com/rhinstaller/pyparted/archive/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python-devel @@ -90,6 +90,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Jun 22 2017 David Cantrell - 1:3.11.0-1 +- Upgrade to pyparted-3.11.0 + * Sat Feb 11 2017 Fedora Release Engineering - 1:3.10.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 9f457bb..28721ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa09a5a416500e6bd0f63c9c12caf2bb pyparted-3.10.7.tar.gz +SHA512 (pyparted-3.11.0.tar.gz) = da93cd9f2b0f0220c54eaa3f43a15ac48d7dfab6ad2c8c8791f1d2146138ac9f8c12ea7e9222054a241b7fff12b3b0c648ef6e73fe1d3b6db215e77d7574719b From 86d5ab3888580826150cfc9458d6fc0c45a7ace9 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 26 Jun 2017 08:14:27 -0400 Subject: [PATCH 06/79] BuildRequires python[3]-six --- pyparted.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 6a5b350..2f15b4e 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -13,8 +13,10 @@ Source0: https://github.com/rhinstaller/pyparted/archive/%{name}-%{version}.tar. BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python-devel +BuildRequires: python-six %if 0%{?with_python3} BuildRequires: python3-devel +BuildRequires: python3-six %endif BuildRequires: parted-devel >= 3.1-14 BuildRequires: pkgconfig @@ -90,6 +92,9 @@ rm -rf %{buildroot} %endif %changelog +* Mon Jun 26 2017 David Cantrell - 1:3.11.0-2 +- BuildRequires python[3]-six + * Thu Jun 22 2017 David Cantrell - 1:3.11.0-1 - Upgrade to pyparted-3.11.0 From 8edcbf8542dc27c678139afbca0447ffa8346609 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 13 Jul 2017 13:35:28 -0400 Subject: [PATCH 07/79] Require parted-3.2-18 in order to ensure #25 does not occur --- pyparted.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index 2f15b4e..3d9d25f 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -18,7 +18,7 @@ BuildRequires: python-six BuildRequires: python3-devel BuildRequires: python3-six %endif -BuildRequires: parted-devel >= 3.1-14 +BuildRequires: parted-devel >= 3.2-18 BuildRequires: pkgconfig BuildRequires: e2fsprogs @@ -92,6 +92,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Jul 13 2017 David Cantrell - 1:3.11.0-3 +- Require parted-3.2-18 in order to ensure #25 does not occur + * Mon Jun 26 2017 David Cantrell - 1:3.11.0-2 - BuildRequires python[3]-six From 6547141dac0ff9cb52e57fe629ec69c1226bde68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 09:22:38 +0000 Subject: [PATCH 08/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 3d9d25f..1ea6ded 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -92,6 +92,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1:3.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jul 13 2017 David Cantrell - 1:3.11.0-3 - Require parted-3.2-18 in order to ensure #25 does not occur From c160e96b91fe2d909f424075e6efc481a70f3a5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 06:35:14 +0000 Subject: [PATCH 09/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 1ea6ded..93ab53d 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -92,6 +92,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1:3.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1:3.11.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From c93c7d454d7638f3b3337d13ecb277d5367bc60e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:39:21 -0400 Subject: [PATCH 10/79] Python 2 binary package renamed to python2-pyparted --- pyparted.spec | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index 93ab53d..b48c506 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -22,10 +22,21 @@ BuildRequires: parted-devel >= 3.2-18 BuildRequires: pkgconfig BuildRequires: e2fsprogs -%description -Python module for the parted library. It is used for manipulating +%global _description\ +Python module for the parted library. It is used for manipulating\ partition tables. +%description %_description + +%package -n python2-pyparted +Summary: %summary +%{?python_provide:%python_provide python2-pyparted} +# Remove before F30 +Provides: pyparted%{?_isa} = %{version}-%{release} +Obsoletes: pyparted < %{version}-%{release} + +%description -n python2-pyparted %_description + %if 0%{?with_python3} %package -n python3-pyparted Summary: Python 3 module for GNU parted @@ -75,7 +86,7 @@ popd %clean rm -rf %{buildroot} -%files +%files -n python2-pyparted %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{python_sitearch}/_ped.so @@ -92,6 +103,10 @@ rm -rf %{buildroot} %endif %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1:3.11.0-6 +- Python 2 binary package renamed to python2-pyparted + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Thu Aug 03 2017 Fedora Release Engineering - 1:3.11.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 6c17f4a6ce8164af6ea2f0edf5f01f186cd19fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 20 Aug 2017 10:41:20 -0400 Subject: [PATCH 11/79] Add Provides for the old name without %_isa --- pyparted.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index b48c506..f94e681 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -32,6 +32,7 @@ partition tables. Summary: %summary %{?python_provide:%python_provide python2-pyparted} # Remove before F30 +Provides: pyparted = %{version}-%{release} Provides: pyparted%{?_isa} = %{version}-%{release} Obsoletes: pyparted < %{version}-%{release} @@ -103,6 +104,9 @@ rm -rf %{buildroot} %endif %changelog +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1:3.11.0-7 +- Add Provides for the old name without %%_isa + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1:3.11.0-6 - Python 2 binary package renamed to python2-pyparted See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From f02fbabd72c050c7772d1d922c11c2f0f9f574ae Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 15 Jan 2018 19:35:05 +0100 Subject: [PATCH 12/79] Update Python 2 dependency declarations to new packaging standards --- pyparted.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index f94e681..cd60f3e 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -12,8 +12,8 @@ URL: https://github.com/rhinstaller/pyparted Source0: https://github.com/rhinstaller/pyparted/archive/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) -BuildRequires: python-devel -BuildRequires: python-six +BuildRequires: python2-devel +BuildRequires: python2-six %if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-six @@ -104,6 +104,10 @@ rm -rf %{buildroot} %endif %changelog +* Mon Jan 15 2018 Iryna Shcherbina - 1:3.11.0-8 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1:3.11.0-7 - Add Provides for the old name without %%_isa From 6a04fce2f76fd7addac329e541cdf618eaa94f5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 06:16:37 +0000 Subject: [PATCH 13/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index cd60f3e..4b30e55 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -104,6 +104,9 @@ rm -rf %{buildroot} %endif %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1:3.11.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 15 2018 Iryna Shcherbina - 1:3.11.0-8 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 321540f0d02603eaef50819bc284ee10595d4f81 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:22:29 +0100 Subject: [PATCH 14/79] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- pyparted.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 4b30e55..bd79bf6 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -11,7 +11,6 @@ URL: https://github.com/rhinstaller/pyparted Source0: https://github.com/rhinstaller/pyparted/archive/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python2-devel BuildRequires: python2-six %if 0%{?with_python3} From 14eba1980938a4b1b1dbc42f089c4a59146ecfdb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:32:21 +0100 Subject: [PATCH 15/79] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- pyparted.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index bd79bf6..f512c46 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -83,9 +83,6 @@ PYTHON=python3 make test popd %endif -%clean -rm -rf %{buildroot} - %files -n python2-pyparted %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO From e63a0b68790bc8a7304d14aec4c54618e45029a2 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 2 Apr 2018 16:21:13 -0700 Subject: [PATCH 16/79] Add epoch to pyparted provides/obsoletes/requires Without this, they don't work right, especially the obsolete - upgrade doesn't work right as we don't properly obsolete it. --- pyparted.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index f512c46..b387371 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -31,9 +31,9 @@ partition tables. Summary: %summary %{?python_provide:%python_provide python2-pyparted} # Remove before F30 -Provides: pyparted = %{version}-%{release} -Provides: pyparted%{?_isa} = %{version}-%{release} -Obsoletes: pyparted < %{version}-%{release} +Provides: pyparted = %{epoch}:%{version}-%{release} +Provides: pyparted%{?_isa} = %{epoch}:%{version}-%{release} +Obsoletes: pyparted < %{epoch}:%{version}-%{release} %description -n python2-pyparted %_description @@ -100,6 +100,9 @@ popd %endif %changelog +* Mon Apr 02 2018 Adam Williamson - 1:3.11.0-10 +- Make pyparted provides/obsoletes include the epoch + * Fri Feb 09 2018 Fedora Release Engineering - 1:3.11.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From fcc63ed368533af4c7f0c9e43bc2575b034705e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 15 Jun 2018 23:21:50 +0200 Subject: [PATCH 17/79] Rebuilt for Python 3.7 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index b387371..efdbcf9 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -100,6 +100,9 @@ popd %endif %changelog +* Fri Jun 15 2018 Miro Hrončok - 1:3.11.0-11 +- Rebuilt for Python 3.7 + * Mon Apr 02 2018 Adam Williamson - 1:3.11.0-10 - Make pyparted provides/obsoletes include the epoch From 715574b2a5e292f7355ecff59053407c3b26d339 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:54:21 -0500 Subject: [PATCH 18/79] Remove needless use of %defattr --- pyparted.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index efdbcf9..1c81445 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -84,7 +84,6 @@ popd %endif %files -n python2-pyparted -%defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{python_sitearch}/_ped.so %{python_sitearch}/parted @@ -92,7 +91,6 @@ popd %if 0%{?with_python3} %files -n python3-pyparted -%defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO %{python3_sitearch}/_ped.*.so %{python3_sitearch}/parted From c18432411468bbe83133754f8a15177130b5960d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 23:11:56 +0000 Subject: [PATCH 19/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 1c81445..923bf1a 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,7 +4,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -98,6 +98,9 @@ popd %endif %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1:3.11.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 15 2018 Miro Hrončok - 1:3.11.0-11 - Rebuilt for Python 3.7 From 4bc49bbd4fc603ae818213e381a030a92d6cce9f Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 24 Jul 2018 10:08:41 -0400 Subject: [PATCH 20/79] Use 'python2' when building the Python 2.x bindings (#1605566) --- pyparted.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index 923bf1a..0a0be3a 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -4,13 +4,14 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted Source0: https://github.com/rhinstaller/pyparted/archive/%{name}-%{version}.tar.gz +BuildRequires: gcc BuildRequires: python2-devel BuildRequires: python2-six %if 0%{?with_python3} @@ -56,7 +57,7 @@ cp -a . %{py3dir} %endif %build -make %{?_smp_mflags} +PYTHON=python2 make %{?_smp_mflags} %if 0%{?with_python3} pushd %{py3dir} @@ -64,18 +65,8 @@ PYTHON=python3 make %{?_smp_mflags} popd %endif -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} - -%if 0%{?with_python3} -pushd %{py3dir} -PYTHON=python3 make install DESTDIR=%{buildroot} -popd -%endif - %check -make test +PYTHON=python2 make test %if 0%{?with_python3} pushd %{py3dir} @@ -83,6 +74,16 @@ PYTHON=python3 make test popd %endif +%install +rm -rf %{buildroot} +PYTHON=python2 make install DESTDIR=%{buildroot} + +%if 0%{?with_python3} +pushd %{py3dir} +PYTHON=python3 make install DESTDIR=%{buildroot} +popd +%endif + %files -n python2-pyparted %doc AUTHORS COPYING NEWS README TODO %{python_sitearch}/_ped.so @@ -98,6 +99,9 @@ popd %endif %changelog +* Tue Jul 24 2018 David Cantrell - 1:3.11.0-13 +- Use 'python2' when building the Python 2.x bindings (#1605566) + * Fri Jul 13 2018 Fedora Release Engineering - 1:3.11.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From fa5d5e764839907760b2b540d194e28f33c82f1a Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 24 Jul 2018 10:09:02 -0400 Subject: [PATCH 21/79] Use 'python2' when building the Python 2.x bindings (#1605566) BuildRequires gcc (#1605566) --- pyparted.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/pyparted.spec b/pyparted.spec index 0a0be3a..6f3097d 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -101,6 +101,7 @@ popd %changelog * Tue Jul 24 2018 David Cantrell - 1:3.11.0-13 - Use 'python2' when building the Python 2.x bindings (#1605566) +- BuildRequires gcc (#1605566) * Fri Jul 13 2018 Fedora Release Engineering - 1:3.11.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From fd1a7f123a30d34d7e411af017a001b2ce0c7f09 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 24 Jul 2018 10:18:49 -0400 Subject: [PATCH 22/79] Use 'python2' when building the Python 2.x bindings (#1605566) BuildRequires gcc (#1605566) %{python_sitearch} -> %{python2_sitearch} (#1605566) --- pyparted.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index 6f3097d..fe36fb1 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -86,9 +86,9 @@ popd %files -n python2-pyparted %doc AUTHORS COPYING NEWS README TODO -%{python_sitearch}/_ped.so -%{python_sitearch}/parted -%{python_sitearch}/%{name}-%{version}-*.egg-info +%{python2_sitearch}/_ped.so +%{python2_sitearch}/parted +%{python2_sitearch}/%{name}-%{version}-*.egg-info %if 0%{?with_python3} %files -n python3-pyparted @@ -102,6 +102,7 @@ popd * Tue Jul 24 2018 David Cantrell - 1:3.11.0-13 - Use 'python2' when building the Python 2.x bindings (#1605566) - BuildRequires gcc (#1605566) +- %%{python_sitearch} -> %%{python2_sitearch} (#1605566) * Fri Jul 13 2018 Fedora Release Engineering - 1:3.11.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a332a006d0b07114a84a80e9768889f36e45d074 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 25 Jul 2018 15:21:54 -0400 Subject: [PATCH 23/79] Conditionalize python2 and python3 builds to make the SRPM more portable across releases. On RHEL > 7 and Fedora > 28, do not build for python2. On RHEL <= 7, do not build for python3. --- pyparted.spec | 116 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 84 insertions(+), 32 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index fe36fb1..2487df5 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -1,10 +1,42 @@ -%define with_python3 1 +%if 0%{?rhel} +%if %{rhel} <= 7 +# disable python3 by default +%bcond_with python3 +%else +%bcond_without python3 +%endif + +%if %{rhel} > 7 +# disable python2 by default +%bcond_with python2 +%else +%bcond_without python2 +%endif +%endif + +%if 0%{?fedora} +%if %{fedora} < 23 +# disable python3 by default +%bcond_with python3 +%else +%bcond_without python3 +%endif + +%if %{fedora} > 28 +# disable python2 by default +%bcond_with python2 +%else +%bcond_without python2 +%endif +%endif + +%global py2dir python2-build Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -12,22 +44,27 @@ URL: https://github.com/rhinstaller/pyparted Source0: https://github.com/rhinstaller/pyparted/archive/%{name}-%{version}.tar.gz BuildRequires: gcc -BuildRequires: python2-devel -BuildRequires: python2-six -%if 0%{?with_python3} -BuildRequires: python3-devel -BuildRequires: python3-six -%endif BuildRequires: parted-devel >= 3.2-18 BuildRequires: pkgconfig BuildRequires: e2fsprogs +%if %{with python3} +BuildRequires: python3-devel +BuildRequires: python3-six +%endif + +%if %{with python2} +BuildRequires: python2-devel +BuildRequires: python2-six +%endif + %global _description\ Python module for the parted library. It is used for manipulating\ partition tables. %description %_description +%if %{with python2} %package -n python2-pyparted Summary: %summary %{?python_provide:%python_provide python2-pyparted} @@ -37,8 +74,9 @@ Provides: pyparted%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: pyparted < %{epoch}:%{version}-%{release} %description -n python2-pyparted %_description +%endif -%if 0%{?with_python3} +%if %{with python3} %package -n python3-pyparted Summary: Python 3 module for GNU parted Group: System Environment/Libraries @@ -51,46 +89,47 @@ partition tables. This package provides Python 3 bindings for parted. %prep %setup -q -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} +%if %{with python2} +rm -rf ../%{py2dir} +mkdir -p ../%{py2dir} +cp -a . ../%{py2dir} +mv ../%{py2dir} . %endif %build -PYTHON=python2 make %{?_smp_mflags} - -%if 0%{?with_python3} -pushd %{py3dir} +%if %{with python3} PYTHON=python3 make %{?_smp_mflags} +%endif + +%if %{with python2} +pushd %{py2dir} +PYTHON=python2 make %{?_smp_mflags} popd %endif %check -PYTHON=python2 make test - -%if 0%{?with_python3} -pushd %{py3dir} +%if %{with python3} PYTHON=python3 make test +%endif + +%if %{with python2} +pushd %{py2dir} +PYTHON=python2 make test popd %endif %install -rm -rf %{buildroot} -PYTHON=python2 make install DESTDIR=%{buildroot} - -%if 0%{?with_python3} -pushd %{py3dir} +%if %{with python3} PYTHON=python3 make install DESTDIR=%{buildroot} +%endif + +%if %{with python2} +pushd %{py2dir} +PYTHON=python2 make install DESTDIR=%{buildroot} popd %endif -%files -n python2-pyparted -%doc AUTHORS COPYING NEWS README TODO -%{python2_sitearch}/_ped.so -%{python2_sitearch}/parted -%{python2_sitearch}/%{name}-%{version}-*.egg-info - -%if 0%{?with_python3} +%if %{with python3} %files -n python3-pyparted %doc AUTHORS COPYING NEWS README TODO %{python3_sitearch}/_ped.*.so @@ -98,7 +137,20 @@ popd %{python3_sitearch}/%{name}-%{version}-*.egg-info %endif +%if %{with python2} +%files -n python2-pyparted +%doc AUTHORS COPYING NEWS README TODO +%{python2_sitearch}/_ped.so +%{python2_sitearch}/parted +%{python2_sitearch}/%{name}-%{version}-*.egg-info +%endif + %changelog +* Wed Jul 25 2018 David Cantrell - 1:3.11.0-14 +- Conditionalize python2 and python3 builds to make the SRPM more portable + across releases. On RHEL > 7 and Fedora > 28, do not build for python2. + On RHEL <= 7, do not build for python3. + * Tue Jul 24 2018 David Cantrell - 1:3.11.0-13 - Use 'python2' when building the Python 2.x bindings (#1605566) - BuildRequires gcc (#1605566) From 9d1cdadc55ebaf23c5383dcaeff819466382884b Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 26 Jul 2018 13:29:11 -0400 Subject: [PATCH 24/79] Do not disable python2 builds by default. There are still some packages that have not been updated to python3 and require python2-pyparted. --- pyparted.spec | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index 2487df5..c5ffc3a 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -22,12 +22,21 @@ %bcond_without python3 %endif -%if %{fedora} > 28 -# disable python2 by default -%bcond_with python2 -%else +# XXX: uncomment this when things that use python2-pyparted can use +# the python3 version. Be sure to change '28' to the appropriate +# version number. Also, replace all the '@' signs with '%' because +# I cannot remember this macro construct, I'm just commenting it out. +# --dcantrell +#@if @{fedora} > 28 +## disable python2 by default +#@bcond_with python2 +#@else +#@bcond_without python2 +#@endif + +# XXX: And delete this when you can disable python2 by default. --dcantrell %bcond_without python2 -%endif + %endif %global py2dir python2-build @@ -36,7 +45,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -146,6 +155,10 @@ popd %endif %changelog +* Thu Jul 26 2018 David Cantrell - 1:3.11.0-15 +- Do not disable python2 builds by default. There are still some packages + that have not been updated to python3 and require python2-pyparted. + * Wed Jul 25 2018 David Cantrell - 1:3.11.0-14 - Conditionalize python2 and python3 builds to make the SRPM more portable across releases. On RHEL > 7 and Fedora > 28, do not build for python2. From 02dd5857d4b7b1879e6b77fb5bdc08d40f5c8ba0 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 26 Jul 2018 14:31:45 -0400 Subject: [PATCH 25/79] Do not disable python2 builds by default. There are still some packages that have not been updated to python3 and require python2-pyparted. --- pyparted.spec | 53 ++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index c5ffc3a..50978ed 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -39,8 +39,6 @@ %endif -%global py2dir python2-build - Summary: Python module for GNU parted Name: pyparted Epoch: 1 @@ -98,52 +96,43 @@ partition tables. This package provides Python 3 bindings for parted. %prep %setup -q -%if %{with python2} -rm -rf ../%{py2dir} -mkdir -p ../%{py2dir} -cp -a . ../%{py2dir} -mv ../%{py2dir} . +%if %{with python3} +rm -rf %{py3dir} +mkdir -p %{py3dir} +cp -a . %{py3dir} %endif %build -%if %{with python3} -PYTHON=python3 make %{?_smp_mflags} +%if %{with python2} +PYTHON=python2 make %{?_smp_mflags} %endif -%if %{with python2} -pushd %{py2dir} -PYTHON=python2 make %{?_smp_mflags} +%if %{with python3} +pushd %{py3dir} +PYTHON=python3 make %{?_smp_mflags} popd %endif %check -%if %{with python3} -PYTHON=python3 make test +%if %{with python2} +PYTHON=python2 make test %endif -%if %{with python2} -pushd %{py2dir} -PYTHON=python2 make test +%if %{with python3} +pushd %{py3dir} +PYTHON=python3 make test popd %endif %install -%if %{with python3} -PYTHON=python3 make install DESTDIR=%{buildroot} -%endif - %if %{with python2} -pushd %{py2dir} PYTHON=python2 make install DESTDIR=%{buildroot} -popd %endif %if %{with python3} -%files -n python3-pyparted -%doc AUTHORS COPYING NEWS README TODO -%{python3_sitearch}/_ped.*.so -%{python3_sitearch}/parted -%{python3_sitearch}/%{name}-%{version}-*.egg-info +pushd %{py3dir} +PYTHON=python3 make install DESTDIR=%{buildroot} +popd %endif %if %{with python2} @@ -154,6 +143,14 @@ popd %{python2_sitearch}/%{name}-%{version}-*.egg-info %endif +%if %{with python3} +%files -n python3-pyparted +%doc AUTHORS COPYING NEWS README TODO +%{python3_sitearch}/_ped.*.so +%{python3_sitearch}/parted +%{python3_sitearch}/%{name}-%{version}-*.egg-info +%endif + %changelog * Thu Jul 26 2018 David Cantrell - 1:3.11.0-15 - Do not disable python2 builds by default. There are still some packages From 79c57a44cb68b12c2e1f4ca147eaddcd944960c4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 27 Jul 2018 14:55:21 +0200 Subject: [PATCH 26/79] Rebuild for new binutils Signed-off-by: Igor Gnatenko --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 50978ed..40ecf06 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -43,7 +43,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -152,6 +152,9 @@ popd %endif %changelog +* Fri Jul 27 2018 Igor Gnatenko - 1:3.11.0-16 +- Rebuild for new binutils + * Thu Jul 26 2018 David Cantrell - 1:3.11.0-15 - Do not disable python2 builds by default. There are still some packages that have not been updated to python3 and require python2-pyparted. From efb99947aee39b3650e437a855cd7cb8ac19a343 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 31 Jul 2018 12:55:15 +0200 Subject: [PATCH 27/79] Rebuild with fixed binutils --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 40ecf06..a4abdf7 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -43,7 +43,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -152,6 +152,9 @@ popd %endif %changelog +* Tue Jul 31 2018 Florian Weimer - 1:3.11.0-17 +- Rebuild with fixed binutils + * Fri Jul 27 2018 Igor Gnatenko - 1:3.11.0-16 - Rebuild for new binutils From b859cadf3ff1ebb7a7447a4f8eb2fd8e6dec09a2 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 19 Dec 2018 09:55:01 -0500 Subject: [PATCH 28/79] Add Fedora CI gating tests for pyparted. --- gating.yml | 6 ++++++ tests/scripts/run_tests.sh | 29 +++++++++++++++++++++++++++++ tests/tests.yaml | 15 +++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 gating.yml create mode 100755 tests/scripts/run_tests.sh create mode 100644 tests/tests.yaml diff --git a/gating.yml b/gating.yml new file mode 100644 index 0000000..d71584a --- /dev/null +++ b/gating.yml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +rules: + - !PassingTestCaseRule {test_case_name: dist.depcheck} diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh new file mode 100755 index 0000000..21804db --- /dev/null +++ b/tests/scripts/run_tests.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +PATH=/usr/bin +TMPDIR="$(mktemp -d)" +CWD="$(pwd)" + +PACKAGE=pyparted +BRANCH= + +# clone the dist-git tree for this package +cd ${TMPDIR} +fedpkg co ${PACKAGE} +cd ${PACKAGE} +[ -z "${BRANCH}" ] || fedpkg switch-branch ${BRANCH} +fedpkg prep + +# scramble together the extracted source tree name +SRCDIR="${PACKAGE}-$(grep Version: ${PACKAGE}.spec | cut -d ' ' -f 2)" + +# run the tests +cd ${SRCDIR} +#make check # this runs pylint, which is sometimes wrong/noisy +make test +RET=$? + +# clean up and exit +cd ${CWD} +rm -rf ${TMPDIR} +exit ${RET} diff --git a/tests/tests.yaml b/tests/tests.yaml new file mode 100644 index 0000000..b0c2d13 --- /dev/null +++ b/tests/tests.yaml @@ -0,0 +1,15 @@ +--- + +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + + required_packages: + - fedpkg + + tests: + - simple: + dir: scripts/ + run: run_tests.sh From f07ca87d453f9315c30d2fa641b4b8875fa89eaf Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 19 Dec 2018 09:58:30 -0500 Subject: [PATCH 29/79] tests.yaml -> tests.yml --- tests/{tests.yaml => tests.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/{tests.yaml => tests.yml} (100%) diff --git a/tests/tests.yaml b/tests/tests.yml similarity index 100% rename from tests/tests.yaml rename to tests/tests.yml From 450d75ce78a0f7a92e4f277d7c00bca11fb6bb57 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 19 Dec 2018 10:34:21 -0500 Subject: [PATCH 30/79] Modify the test run line in tests.yml 'run: run_tests.sh' -> run: ./run_tests.sh' --- tests/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index b0c2d13..171d4d0 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -12,4 +12,4 @@ tests: - simple: dir: scripts/ - run: run_tests.sh + run: ./run_tests.sh From 7ddeef7214394705aaa79b0dbdba3ef38de756a7 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 23 Jan 2019 16:04:23 -0500 Subject: [PATCH 31/79] gating.yml -> gating.yaml --- gating.yml => gating.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gating.yml => gating.yaml (100%) diff --git a/gating.yml b/gating.yaml similarity index 100% rename from gating.yml rename to gating.yaml From c85f2a3201c9680c1a98ee5ba3f38b887ce6b27d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:14 +0100 Subject: [PATCH 32/79] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- pyparted.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index a4abdf7..c499d99 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -45,7 +45,6 @@ Epoch: 1 Version: 3.11.0 Release: 17%{?dist} License: GPLv2+ -Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted Source0: https://github.com/rhinstaller/pyparted/archive/%{name}-%{version}.tar.gz @@ -86,7 +85,6 @@ Obsoletes: pyparted < %{epoch}:%{version}-%{release} %if %{with python3} %package -n python3-pyparted Summary: Python 3 module for GNU parted -Group: System Environment/Libraries %description -n python3-pyparted Python module for the parted library. It is used for manipulating From 431cba9788f0db3e780a653a998aeace6be0d92c Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 1 Feb 2019 13:55:01 -0500 Subject: [PATCH 33/79] pyparted-3.11.2 (dcantrell) Do not remove the generated tarballs. (dcantrell) Update the RELEASE file. (dcantrell) tests: Fix flag_get_name tests (bcl) Avoid potential NULL dereferences in pydisk.c and pytimer.c (dcantrell) New - example to query device capacity (jflorian) correct spelling mistake (edward) _ped's *_flag_get_name methods now throw a PartedException instead of ValueError on unsupported flags. (lukasz.zemczak) Make the partition name a property on parted.Partition objects (#34) (dcantrell) --- .gitignore | 2 ++ pyparted.spec | 18 ++++++++++++++++-- sources | 3 ++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index edda747..c5a1c6e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /pyparted-3.10.6.tar.gz /pyparted-3.10.7.tar.gz /pyparted-3.11.0.tar.gz +/pyparted-3.11.2.tar.gz +/pyparted-3.11.2.tar.gz.asc diff --git a/pyparted.spec b/pyparted.spec index c499d99..f4ab6de 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -42,8 +42,8 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 -Version: 3.11.0 -Release: 17%{?dist} +Version: 3.11.2 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/rhinstaller/pyparted @@ -150,6 +150,20 @@ popd %endif %changelog +* Fri Feb 01 2019 David Cantrell - 1:3.11.2-1 +- pyparted-3.11.2 (dcantrell) +- Do not remove the generated tarballs. (dcantrell) +- Update the RELEASE file. (dcantrell) +- tests: Fix flag_get_name tests (bcl) +- Avoid potential NULL dereferences in pydisk.c and pytimer.c + (dcantrell) +- New - example to query device capacity (jflorian) +- correct spelling mistake (edward) +- _ped's *_flag_get_name methods now throw a PartedException instead of + ValueError on unsupported flags. (lukasz.zemczak) +- Make the partition name a property on parted.Partition objects (#34) + (dcantrell) + * Tue Jul 31 2018 Florian Weimer - 1:3.11.0-17 - Rebuild with fixed binutils diff --git a/sources b/sources index 28721ec..aa46143 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (pyparted-3.11.0.tar.gz) = da93cd9f2b0f0220c54eaa3f43a15ac48d7dfab6ad2c8c8791f1d2146138ac9f8c12ea7e9222054a241b7fff12b3b0c648ef6e73fe1d3b6db215e77d7574719b +SHA512 (pyparted-3.11.2.tar.gz) = c91b3113951f3bb032f5c1309b5c301754b1aa9a5347a3bf4bbd6d6d23c929da63fbbe8e922660af6249c1037e9594ceb73fd28b77c2fda5f0833b1816f002f3 +SHA512 (pyparted-3.11.2.tar.gz.asc) = 4fba573c319518db3b3c9d80f65a8869f687c7abc028b3a153088adfe09b203987983b8e8f4e79e8ff3e0a6c6e584df140d13ac1d276e4f3a691d4e1dd33b60d From 9e2b6c9c0064f911f38a57bcf1f96381b9c386f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 11:46:14 +0000 Subject: [PATCH 34/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index f4ab6de..ca24490 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -43,7 +43,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/rhinstaller/pyparted @@ -150,6 +150,9 @@ popd %endif %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1:3.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 David Cantrell - 1:3.11.2-1 - pyparted-3.11.2 (dcantrell) - Do not remove the generated tarballs. (dcantrell) From d4bab4c0f3a5b663bd7ac5649c0b5b5394dfaa71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 16 Aug 2019 05:17:06 +0200 Subject: [PATCH 35/79] Rebuilt for Python 3.8 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index ca24490..2f5a86c 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -43,7 +43,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/rhinstaller/pyparted @@ -150,6 +150,9 @@ popd %endif %changelog +* Fri Aug 16 2019 Miro Hrončok - 1:3.11.2-3 +- Rebuilt for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 1:3.11.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e15d28a3aa253f20d8d63529e2abeaa3311152da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 13:59:49 +0200 Subject: [PATCH 36/79] Rebuilt for Python 3.8.0rc1 (#1748018) --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 2f5a86c..edcffaa 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -43,7 +43,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://github.com/rhinstaller/pyparted @@ -150,6 +150,9 @@ popd %endif %changelog +* Thu Oct 03 2019 Miro Hrončok - 1:3.11.2-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Fri Aug 16 2019 Miro Hrončok - 1:3.11.2-3 - Rebuilt for Python 3.8 From 32e3694413e1a7209167e443c2186c975d198eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 20 Oct 2019 21:53:02 +0200 Subject: [PATCH 37/79] Remove python2-pyparted from Fedora 32+ https://bugzilla.redhat.com/show_bug.cgi?id=1761222 --- pyparted.spec | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index edcffaa..6a2d2c0 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -22,28 +22,19 @@ %bcond_without python3 %endif -# XXX: uncomment this when things that use python2-pyparted can use -# the python3 version. Be sure to change '28' to the appropriate -# version number. Also, replace all the '@' signs with '%' because -# I cannot remember this macro construct, I'm just commenting it out. -# --dcantrell -#@if @{fedora} > 28 -## disable python2 by default -#@bcond_with python2 -#@else -#@bcond_without python2 -#@endif - -# XXX: And delete this when you can disable python2 by default. --dcantrell +%if %{fedora} > 31 +# disable python2 by default +%bcond_with python2 +%else %bcond_without python2 - +%endif %endif Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://github.com/rhinstaller/pyparted @@ -150,6 +141,9 @@ popd %endif %changelog +* Sun Oct 20 2019 Miro Hrončok - 1:3.11.2-5 +- Remove python2-pyparted from Fedora 32+ + * Thu Oct 03 2019 Miro Hrončok - 1:3.11.2-4 - Rebuilt for Python 3.8.0rc1 (#1748018) From 914d8b9212b2b05b159b9b52710280b73ed80a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sun, 20 Oct 2019 22:15:46 +0200 Subject: [PATCH 38/79] Drop the %{py3dir} pattern %{py3dir} is outside of the expected build directory, causing this error when only building for Python 3: Empty %files file /builddir/build/BUILD/pyparted-3.11.2/debugsourcefiles.list That's because the mechanism that looks for sources checks all the compiled files in the build directory and because they are all outside, it fails. This hasn't happened with the python2 subpackage, because it found the compiled python2 files. Note that %{py3dir} was part of the Python guidelines early in the Python 3 adoption in Fedora, long before we've introduced the debugsource packages. Instead, we create a directory called "py3dir" in the build directory. There are other solutions possible, but this is the least intrusive in this case. --- pyparted.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index 6a2d2c0..eeb7895 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -86,9 +86,9 @@ partition tables. This package provides Python 3 bindings for parted. %setup -q %if %{with python3} -rm -rf %{py3dir} -mkdir -p %{py3dir} -cp -a . %{py3dir} +everything=$(ls) +mkdir -p py3dir +cp -a $everything py3dir %endif %build @@ -97,7 +97,7 @@ PYTHON=python2 make %{?_smp_mflags} %endif %if %{with python3} -pushd %{py3dir} +pushd py3dir PYTHON=python3 make %{?_smp_mflags} popd %endif @@ -108,7 +108,7 @@ PYTHON=python2 make test %endif %if %{with python3} -pushd %{py3dir} +pushd py3dir PYTHON=python3 make test popd %endif @@ -119,7 +119,7 @@ PYTHON=python2 make install DESTDIR=%{buildroot} %endif %if %{with python3} -pushd %{py3dir} +pushd py3dir PYTHON=python3 make install DESTDIR=%{buildroot} popd %endif From 2f159223e6d1414e66a86f934ba4c86f17507c36 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 15 Nov 2019 09:09:03 -0500 Subject: [PATCH 39/79] Fix deprecation warning in parted/cachedlist.py (#1772060) --- .gitignore | 1 + pyparted.spec | 11 +++++++---- sources | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c5a1c6e..31679d4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /pyparted-3.11.0.tar.gz /pyparted-3.11.2.tar.gz /pyparted-3.11.2.tar.gz.asc +/pyparted-3.11.3.tar.gz diff --git a/pyparted.spec b/pyparted.spec index eeb7895..200dcea 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -33,12 +33,12 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 -Version: 3.11.2 -Release: 5%{?dist} +Version: 3.11.3 +Release: 1%{?dist} License: GPLv2+ -URL: https://github.com/rhinstaller/pyparted +URL: https://github.com/dcantrell/pyparted -Source0: https://github.com/rhinstaller/pyparted/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/dcantrell/pyparted/archive/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: parted-devel >= 3.2-18 @@ -141,6 +141,9 @@ popd %endif %changelog +* Fri Nov 15 2019 David Cantrell - 1:3.11.3-1 +- Fix deprecation warning in parted/cachedlist.py (#1772060) + * Sun Oct 20 2019 Miro Hrončok - 1:3.11.2-5 - Remove python2-pyparted from Fedora 32+ diff --git a/sources b/sources index aa46143..eec434c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (pyparted-3.11.2.tar.gz) = c91b3113951f3bb032f5c1309b5c301754b1aa9a5347a3bf4bbd6d6d23c929da63fbbe8e922660af6249c1037e9594ceb73fd28b77c2fda5f0833b1816f002f3 -SHA512 (pyparted-3.11.2.tar.gz.asc) = 4fba573c319518db3b3c9d80f65a8869f687c7abc028b3a153088adfe09b203987983b8e8f4e79e8ff3e0a6c6e584df140d13ac1d276e4f3a691d4e1dd33b60d +SHA512 (pyparted-3.11.3.tar.gz) = 861869d286ddca64e536851a992608e5c9482f55a2978c93386a167e73d05effa3ad80495a9b81af6973ee6770b9d6ef693e133fe086073698e8e02aa5ee5931 From 85315a929d32773f5c07529363b21c8adf8e66ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 10:14:08 +0000 Subject: [PATCH 40/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 200dcea..a07c818 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -141,6 +141,9 @@ popd %endif %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1:3.11.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Nov 15 2019 David Cantrell - 1:3.11.3-1 - Fix deprecation warning in parted/cachedlist.py (#1772060) From e54c3fce0a7101e601d96a7e683f9b316589662c Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 11 Feb 2020 10:58:02 -0500 Subject: [PATCH 41/79] Use Decimal for Device.getSize() operations, return a float (#1801355) Update the 'twine upload' line in the Makefile Don't intentionally prohibit Python 2 usage (#67) mips64 support --- .gitignore | 2 ++ keyring.gpg | Bin 0 -> 4556 bytes pyparted.spec | 24 +++++++++++++++++++----- sources | 3 ++- trustdb.gpg | Bin 0 -> 1440 bytes 5 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 keyring.gpg create mode 100644 trustdb.gpg diff --git a/.gitignore b/.gitignore index 31679d4..e830d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /pyparted-3.11.2.tar.gz /pyparted-3.11.2.tar.gz.asc /pyparted-3.11.3.tar.gz +/pyparted-3.11.4.tar.gz +/pyparted-3.11.4.tar.gz.asc diff --git a/keyring.gpg b/keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..10fab63c2af6ac1ffb5794a3b49ce0ce41847aed GIT binary patch literal 4556 zcmbuCXHb;OwuZkM1{v}YhAdghLq-u428JOc0s@kA&L9E;f*?t92FW>z?-rC2#&pkiRy?58StE#Ks?&@CEKc4ljS^xmhgFpaSUP99h002NwqQ~ct^@si) zL?vL*KU66Iz;*yIKm$GNt?Xuq!y}1sH8e_iUEhnWHw6HI{*PNCF+>DijL3k*J#=!Q zm#YKPn0*HT0MS2_K>$1e01p8G!1wzE(-Hsx{@)sk2>^ibZ;g}xPmKvc{(SvE#$P{9 z0^>t;bAnJH81U%@TrHj3`pK*4$JBh~Z;Z=++JtIk^63B?B?M(v9-7T?66L^%jt7xy4dZ2EJ~G^sJ7fkVtDkmLUTsb<(}F0 z1`5nUL9L#-3f)t|#<5*&d#4NMiu>_AB22zH_2;}DVEzA%g*>A*QH-p zqziqh6(FtH)LK=Q%k+L`GSKjrX6D1viU8bkiDzP@Z(N68h?P70j{a6k2rQ=?y0+kG z)|CdU9yzDbxckX^++O^23nEGGoR^K5{ss+?B< ze?E49;cB!DSNkr$MB1;G8thSAz+x_BWTpK3Tk*S5sauIDoYpo3gm{=tABbx-&5C0Z z>*@kA9z+yZZV<}@KD&Oq_EITCR8V<~SYtzCf2x3-s@{4+#3*vL&4?w;HjY?<@5FVG zu6{UgJKR?aLEPTZ!-OlrlH3~Im%bNm78}{Rq?hENG8^x6tQE-I(BPF-L#l;sGbx2o z)&+<_0H_QP0L&fCfAb4e@u3V|ElubZ3|~2!+8LYDOB&j_IGNhmaMH^;A?QU-jDPRN zolH$E3|$b$_O?&{%mDt4UNBe*LIQ#U56KuH|E>x!!MZuY)?jK3Ok8Xz7WfVv2OEkD zhLC|VKww%BnA``z!G`@+GFy&>x9nLH+-vh4S@hXw#j~DEELFq26M35}kK1L}c;`S=j2F7Zbz>$b zsNTJl>$lqI&p~mU>V=hc5`!C8rD|ylXLY|6s)^GTP;-^VVdlUQM?GNa8p-NxQQbPH zmX+2w@taw-fV><2L`oUR5y{I*Wa4Q`RM>Uwx$Te@w!K=W_woI}ymTbfAv24&WOv@LJcpSNcv780h#?4e}e$HKe zX%dL*S{?+(L<**O!|V^G&!ekW)%6E%Qa)_XofBD2{kz`!OX&md4M%A zfU!BMXJq@CS~pJb9MvG-ipeSGrC-(Q)8|6 zm=ZxVwHeXxs>#i%M?7_;#rvv_oVAGiU+0hvWk9FmV39W7D85PjJrE{xM8j+P&d>v8 zcCFQh#f7WVeqOudl)Fc2-|rOA>UlpV>KQHbjT>W3=-;3Ig)Yas0{E>Ky$n) zu5O~|7OxAOf z1m)afUQ`n_KmtNwOTqi?5?@1DWGSer9_*75o%s*y)!{kw{P^5T4jFkne$=SrU zaB6T~GAh;N;^MTfHSh4Pe3L;xVqMKUZ~}c7YasMg&D_ViYv10_6zAa3$d$WiA*q@O zrd2rM0>c~fO2MM1IZkxlV#SMMPN-dKhJ5VU;pXO z#O5;u?M9Cx`^191?-OPR2vcctRHh0e%uU!L#2-JH%;*dGZg<8XAL`6EVvaumjf+rY zC_=QP6Gtp=yJqF$Ki8X~i+J^ggA^ryk^L<;Y5QXcZb@l_PG-0ir^wSsB`XgXt1KIr zCnE}t(L~fUI;F^10I3L5JHwff&1XjjsTkR&=PMO^GSkwp`qtLd$(1K(<4o@{-q0)# zuvq#~dD^ax*^1sqJv#6I-ne0?h8pqEZ<15MH{fYAfp=ULtkb>5pRyXSFddP%sFxkq z8cqZXOJ_x+Hx%5*do-T>_#k%l#qrum=1C`Za_+*R?9>PDNKH51RtNKh-BbjTN#fv* zKIt7Nw7!{&_u`EN)oRYu1#QT5^LVuR6;Z9+(m&Z0{y*6K!&DJAh(F!aM%>)i(9-5V zbk88v-y}4y2L_~*(TpF36R>oxTOQ^ZwCL4#K#!+?^$=#TBKffRM`zZ3nz$*#r?9To zKjcs9K|aG({bCe@Y-K?1VynHIGH*EMY9KuH3rW2GeaBh;0kvNuzK4$)I)Tx+Kk`k3 zHmode(cxLnxUaoULNzUuu$7!~AGY(>wKBSI+@|3WoHSCq9eMQ7C^Md-$5bhcw?do^ zZn!>MSI)^>ATy@a8E%O-W?JpeJT%?3{=@)9XW>mr zP%PxUk|foEYdOTa3Fi`*V5j&I(Yo3KjXr0yQ+6e~j3c%y%uLLs=pJ?s*#%R+KCfS^fN3IJ$@b-2KG99DT2{R z6Fh5i;i&ldB=u}t47bpGyL9g&7WQB}THV;yLL($B#lS@DSzeS;@uZ}aVW3Cx%T(VJ zC5*qMYI=_= zYJN-fZxi}gV>dH3v3D|baI&{DHFiPRJDL9{{oVU-5?T^Zc+2&g*pSN-)cE-rrD$qm z8@OxU&}ZC8VqKd@B?nPLzU#`{u_qrE>=c=d6fT)GZo9{RrSuW1dGoriK9H;1t(-@KicwU2 z?opq3@pscmwyeuMg{20Xud?)_xAPU38NyCPmjaui^3|8;>7=9D92(|D9OnfRK`yIc z@zQbvNfdb^(T0ZaX;=e_E80M=scQyb;?+(WHXSg3uNmJTThBT$Suag{A<^U`#IjYZ zOr35$YO_`s7v6^Dt^ATbeW#}KJLFS>s$2<+sv+NBgx3G}VA76*P}g&srftsv6~{p7 zT&vS~qR}2AQi3MM%1$QE( zxciJ6s)*u!U$cFLhW+FdT)H#Qq*$)8h~6-qjy~&o$izEg5KbcPlxz?ySVdD`;I$#ac)GbQ7wvW#)a8-jrK0F1;}gLjNK^Amy%0`m0`Q6`)6nl!c(gGGLYio z5msB97~1G>u-pesEE7ua4v$!ie1(Qp!t39$*2l3OmVFwySK{H!hV3SY+clC-B`bZJ zapA!x#@pcMNf1W=^y-~S=Oj^aDpxVtGP`)eOr8tQGs`QnI>Qsa_inA5&`ot1S^QpU zdTe??Kx-XDA0i~ z9hTGnG`-21o?|Yhf%Z_#_DyhUWiwm;()rk;%qwmRg&{85pVfy+Mqlh3pARBnP1_Pz z1ziH({N>@HA?rt->oXx8ZfLW(*=f{f&0)8nY$nZ*V5=3?4r~6Hlz|S}_aRYnl_7r8 z7N>zhWD)Cc-3~jIb%?rV3o3U>4ZqFr0r6V`$7;F%7)*k}LJ$fN6rlfK28lmfA>O|Z z3|!}gH#Bb~Dc-5@RS78PotkG*==BAP({+4^VE#hKf*JXocJpkTI0f@Xk#EZ9v&X22 z1jareJsB8P`CSFU)Hk#;3Y57QdgDVFfkcsI*o_)r3^jjjZ*)n-Qp2ca(@Jc@)gO6y*E(<4 zTV=+#R<`jlA;_wTV_3CC`-<)-CWA!Amw#Osc5RIoh0I*^9cl^)ubRAu$V+Rh#HH_~ zH(zp7mw0(xqR|Fa?pdHu#2+{{-^s9+q^yx=T2o}>{}kO^6AjkGo0FaQ+PV!nxW_5v zzkFc*+V$MJXW4URMgznI6?l4LAAZakQgk;^EJl#*E9NXanx)H&1 z9<#6)bH}LwH86An`>cbFf0skLal|L`zM^o7U*1e{jWu{HDNnK}zWY67+{R;n=6gX{ z1%;0%U&FGs_V%@I)96i%HD{9CgE-?tT2rfRz=(WYtYrTPr<#xKEJSw>rB;$fK_2#( ap-6ob(tWs>D+znYfsjY-*pKyIyZjf~;O-Lu literal 0 HcmV?d00001 diff --git a/pyparted.spec b/pyparted.spec index a07c818..92da511 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -33,17 +33,21 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 -Version: 3.11.3 -Release: 2%{?dist} +Version: 3.11.4 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted -Source0: https://github.com/dcantrell/pyparted/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source1: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc +Source2: keyring.gpg +Source3: trustdb.gpg BuildRequires: gcc BuildRequires: parted-devel >= 3.2-18 BuildRequires: pkgconfig BuildRequires: e2fsprogs +BuildRequires: gnupg2 %if %{with python3} BuildRequires: python3-devel @@ -83,6 +87,9 @@ partition tables. This package provides Python 3 bindings for parted. %endif %prep +# Verify source archive signature +gpg --no-default-keyring --keyring %{SOURCE2} --trustdb-name %{SOURCE3} --verify %{SOURCE1} %{SOURCE0} || exit 1 + %setup -q %if %{with python3} @@ -93,12 +100,12 @@ cp -a $everything py3dir %build %if %{with python2} -PYTHON=python2 make %{?_smp_mflags} +PYTHON=python2 make %{?_smp_mflags} CFLAGS="%{optflags} -fcommon" %endif %if %{with python3} pushd py3dir -PYTHON=python3 make %{?_smp_mflags} +PYTHON=python3 make %{?_smp_mflags} CFLAGS="%{optflags} -fcommon" popd %endif @@ -141,6 +148,13 @@ popd %endif %changelog +* Tue Feb 11 2020 David Cantrell - 1:3.11.4-1 +- Use Decimal for Device.getSize() operations, return a + float (#1801355) +- Update the 'twine upload' line in the Makefile +- Don't intentionally prohibit Python 2 usage (#67) +- mips64 support + * Thu Jan 30 2020 Fedora Release Engineering - 1:3.11.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index eec434c..09fa3fc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (pyparted-3.11.3.tar.gz) = 861869d286ddca64e536851a992608e5c9482f55a2978c93386a167e73d05effa3ad80495a9b81af6973ee6770b9d6ef693e133fe086073698e8e02aa5ee5931 +SHA512 (pyparted-3.11.4.tar.gz) = 73e1f575c200a407392d46c87475f70f5f2405ad28b9b816117703284a75094df05727fcb2243793a31cd9471be5876eb4c22c870218f7a23625cfa359265818 +SHA512 (pyparted-3.11.4.tar.gz.asc) = 5c4426beac456125f56bb65fd8e38856e5822caadf3596f02ecb2c086f0120991f61ebabfbc6fad80d6b8bbb3810f9193ab1bf839f9d1eb507aa9958edfd7993 diff --git a/trustdb.gpg b/trustdb.gpg new file mode 100644 index 0000000000000000000000000000000000000000..cf09ce7b3a1c0c147fed20b6b17ae55934954629 GIT binary patch literal 1440 zcmZQfFGy!*W@Ke#Vql1KI^NHK9WZiX7e@th3=Bl6V;I8f*%1b^)WQ9j?= zOCWU$NTx9`@G_{ea@_4O+<{NfwFKFX~xA>J-t`iN5@ Date: Mon, 9 Mar 2020 13:10:53 -0400 Subject: [PATCH 42/79] Require at least libparted 3.3 and python 3.7 (dcantrell) pedmodule.c: Fix partition enum flag handling (bcl) Add support for chromeos_kernel and bls_boot partition flags (bcl) Move exception declarations to _pedmodule.c (dcantrell) Signed-off-by: David Cantrell --- .gitignore | 2 ++ pyparted.spec | 10 ++++++++-- sources | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e830d0b..d3bbb20 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /pyparted-3.11.3.tar.gz /pyparted-3.11.4.tar.gz /pyparted-3.11.4.tar.gz.asc +/pyparted-3.11.5.tar.gz +/pyparted-3.11.5.tar.gz.asc diff --git a/pyparted.spec b/pyparted.spec index 92da511..9eba9d3 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -33,7 +33,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 -Version: 3.11.4 +Version: 3.11.5 Release: 1%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -44,7 +44,7 @@ Source2: keyring.gpg Source3: trustdb.gpg BuildRequires: gcc -BuildRequires: parted-devel >= 3.2-18 +BuildRequires: parted-devel >= 3.3 BuildRequires: pkgconfig BuildRequires: e2fsprogs BuildRequires: gnupg2 @@ -148,6 +148,12 @@ popd %endif %changelog +* Mon Mar 09 2020 David Cantrell - 1:3.11.5-1 +- Require at least libparted 3.3 and python 3.7 (dcantrell) +- pedmodule.c: Fix partition enum flag handling (bcl) +- Add support for chromeos_kernel and bls_boot partition flags (bcl) +- Move exception declarations to _pedmodule.c (dcantrell) + * Tue Feb 11 2020 David Cantrell - 1:3.11.4-1 - Use Decimal for Device.getSize() operations, return a float (#1801355) diff --git a/sources b/sources index 09fa3fc..e80332f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pyparted-3.11.4.tar.gz) = 73e1f575c200a407392d46c87475f70f5f2405ad28b9b816117703284a75094df05727fcb2243793a31cd9471be5876eb4c22c870218f7a23625cfa359265818 -SHA512 (pyparted-3.11.4.tar.gz.asc) = 5c4426beac456125f56bb65fd8e38856e5822caadf3596f02ecb2c086f0120991f61ebabfbc6fad80d6b8bbb3810f9193ab1bf839f9d1eb507aa9958edfd7993 +SHA512 (pyparted-3.11.5.tar.gz) = c10b4eff7e99755703532d0cb5e26d995ff42f43d12bd92c9950ca9b584d284dc1e57a4791c2fa1e1af16b44154649d265ba41734604ddc2c03247bd2034e3ed +SHA512 (pyparted-3.11.5.tar.gz.asc) = 189b0d34c1b19085d6f59de4dff0bb55aa789d7d6d7e97001012862c32f6180b690f7eea91420d0e052ee6ae15f456317b4248d556653e01327210247dd53795 From c37e0a86d490df3a6f74e64ece2d68b5d75869ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 May 2020 06:49:31 +0200 Subject: [PATCH 43/79] Rebuilt for Python 3.9 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 9eba9d3..e5d4197 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -148,6 +148,9 @@ popd %endif %changelog +* Sat May 23 2020 Miro Hrončok - 1:3.11.5-2 +- Rebuilt for Python 3.9 + * Mon Mar 09 2020 David Cantrell - 1:3.11.5-1 - Require at least libparted 3.3 and python 3.7 (dcantrell) - pedmodule.c: Fix partition enum flag handling (bcl) From 6e7f603dcaeec1eddc02ce72fecd64eabe27189d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 03:10:33 +0000 Subject: [PATCH 44/79] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- pyparted.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index e5d4197..139e3dd 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -100,12 +100,12 @@ cp -a $everything py3dir %build %if %{with python2} -PYTHON=python2 make %{?_smp_mflags} CFLAGS="%{optflags} -fcommon" +PYTHON=python2 %make_build CFLAGS="%{optflags} -fcommon" %endif %if %{with python3} pushd py3dir -PYTHON=python3 make %{?_smp_mflags} CFLAGS="%{optflags} -fcommon" +PYTHON=python3 %make_build CFLAGS="%{optflags} -fcommon" popd %endif @@ -122,12 +122,12 @@ popd %install %if %{with python2} -PYTHON=python2 make install DESTDIR=%{buildroot} +PYTHON=python2 %make_install %endif %if %{with python3} pushd py3dir -PYTHON=python3 make install DESTDIR=%{buildroot} +PYTHON=python3 %make_install popd %endif @@ -148,6 +148,10 @@ popd %endif %changelog +* Tue Jul 14 2020 Tom Stellard - 1:3.11.5-3 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Sat May 23 2020 Miro Hrončok - 1:3.11.5-2 - Rebuilt for Python 3.9 From fd1528e088b62f1c1e9f05d84ebe7306b224f256 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Fri, 23 Oct 2020 15:56:10 -0400 Subject: [PATCH 45/79] Upgrade to pyparted-3.11.7 (BZ#1890443) Set PY_SSIZE_T_CLEAN for the build (bcl) add nvme support Update RELEASE file to make last step be "make pypi" (dcantrell) Signed-off-by: David Cantrell --- .gitignore | 2 ++ pyparted.spec | 10 ++++++++-- sources | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d3bbb20..7d186e8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ /pyparted-3.11.4.tar.gz.asc /pyparted-3.11.5.tar.gz /pyparted-3.11.5.tar.gz.asc +/pyparted-3.11.7.tar.gz +/pyparted-3.11.7.tar.gz.asc diff --git a/pyparted.spec b/pyparted.spec index 139e3dd..a3c2edb 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -33,8 +33,8 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 -Version: 3.11.5 -Release: 3%{?dist} +Version: 3.11.7 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -148,6 +148,12 @@ popd %endif %changelog +* Fri Oct 23 2020 David Cantrell - 1:3.11.7-1 +- Upgrade to pyparted-3.11.7 (BZ#1890443) +- Set PY_SSIZE_T_CLEAN for the build (bcl) +- add nvme support +- Update RELEASE file to make last step be "make pypi" (dcantrell) + * Tue Jul 14 2020 Tom Stellard - 1:3.11.5-3 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro diff --git a/sources b/sources index e80332f..f1c1c2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pyparted-3.11.5.tar.gz) = c10b4eff7e99755703532d0cb5e26d995ff42f43d12bd92c9950ca9b584d284dc1e57a4791c2fa1e1af16b44154649d265ba41734604ddc2c03247bd2034e3ed -SHA512 (pyparted-3.11.5.tar.gz.asc) = 189b0d34c1b19085d6f59de4dff0bb55aa789d7d6d7e97001012862c32f6180b690f7eea91420d0e052ee6ae15f456317b4248d556653e01327210247dd53795 +SHA512 (pyparted-3.11.7.tar.gz) = 41018989c21aab577cd1d51f521128d072b346afb9dcdcc27490cdbc2ed4382a854e4bd16780da72a0a95bbd521f14ee0e7f02816f34656cbae734d43a4f0b83 +SHA512 (pyparted-3.11.7.tar.gz.asc) = 669770930307f57bfd8b1d11418f3fbc1415747aec5cde001efe7b132724996e42271f4df79148e616c2ba76527dfafceeeb1d3374cbd14a16bd545dd716c15c From c5140589339eac0ab63ff541a0d4281f047c88e0 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 19:41:58 +0000 Subject: [PATCH 46/79] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- pyparted.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/pyparted.spec b/pyparted.spec index a3c2edb..c8a5d04 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -43,6 +43,7 @@ Source1: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{n Source2: keyring.gpg Source3: trustdb.gpg +BuildRequires: make BuildRequires: gcc BuildRequires: parted-devel >= 3.3 BuildRequires: pkgconfig From 197cf98baa99f6d29acb625ad727d99e671b3b16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 08:56:08 +0000 Subject: [PATCH 47/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index c8a5d04..91aff3c 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -149,6 +149,9 @@ popd %endif %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1:3.11.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 23 2020 David Cantrell - 1:3.11.7-1 - Upgrade to pyparted-3.11.7 (BZ#1890443) - Set PY_SSIZE_T_CLEAN for the build (bcl) From b244549e30291a44b29f8262468def1e9c0cec6c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 3 Jun 2021 13:33:21 +0200 Subject: [PATCH 48/79] Rebuilt for Python 3.10 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 91aff3c..ace12ea 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -149,6 +149,9 @@ popd %endif %changelog +* Thu Jun 03 2021 Python Maint - 1:3.11.7-3 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 1:3.11.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 10bc59882e8d0d5c0f58505798db20c5afb0162a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 04:29:12 +0000 Subject: [PATCH 49/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index ace12ea..767bcd7 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -149,6 +149,9 @@ popd %endif %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1:3.11.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jun 03 2021 Python Maint - 1:3.11.7-3 - Rebuilt for Python 3.10 From 0ae7d75235a471abdb45a336ffe1ab22b5981e54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 09:51:49 +0000 Subject: [PATCH 50/79] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 767bcd7..fe7aed9 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -149,6 +149,9 @@ popd %endif %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1:3.11.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1:3.11.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 775cb0e480d8ec17518a7757a2438be9280f91b5 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 7 Mar 2022 14:22:47 -0500 Subject: [PATCH 51/79] Upgrade to pyparted-3.12.0 Signed-off-by: David Cantrell --- .gitignore | 2 ++ pyparted.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7d186e8..ced5e17 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ /pyparted-3.11.5.tar.gz.asc /pyparted-3.11.7.tar.gz /pyparted-3.11.7.tar.gz.asc +/pyparted-3.12.0.tar.gz +/pyparted-3.12.0.tar.gz.asc diff --git a/pyparted.spec b/pyparted.spec index fe7aed9..d1c0a78 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -33,8 +33,8 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 -Version: 3.11.7 -Release: 5%{?dist} +Version: 3.12.0 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -149,6 +149,9 @@ popd %endif %changelog +* Mon May 07 2022 David Cantrell - 3.12.0-1 +- Upgrade to pyparted-3.12.0 + * Fri Jan 21 2022 Fedora Release Engineering - 1:3.11.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index f1c1c2b..7f89792 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pyparted-3.11.7.tar.gz) = 41018989c21aab577cd1d51f521128d072b346afb9dcdcc27490cdbc2ed4382a854e4bd16780da72a0a95bbd521f14ee0e7f02816f34656cbae734d43a4f0b83 -SHA512 (pyparted-3.11.7.tar.gz.asc) = 669770930307f57bfd8b1d11418f3fbc1415747aec5cde001efe7b132724996e42271f4df79148e616c2ba76527dfafceeeb1d3374cbd14a16bd545dd716c15c +SHA512 (pyparted-3.12.0.tar.gz) = 0179e5334be8c04287b10b47d407ad339933cd3e20514d2142fe968acf8a36c40e541ee5165e2b3699a40b133d8f1948d8d12ccf307d3a1736090fb33f28b7e7 +SHA512 (pyparted-3.12.0.tar.gz.asc) = 452d386fbc8b84fa0dc186bb75c6c12eb051c8a37575e5a3a0cf504d13c4b2a0134d7e486928f9af7d142d25802bda05c97fd95ff80721ae6f6c0abedb8b1614 From 791a789e24484dce36dadc9ade1084e4fc8a55eb Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Mon, 7 Mar 2022 14:45:25 -0500 Subject: [PATCH 52/79] BR python3-setuptools Signed-off-by: David Cantrell --- pyparted.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index d1c0a78..1debcf1 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -53,6 +53,7 @@ BuildRequires: gnupg2 %if %{with python3} BuildRequires: python3-devel BuildRequires: python3-six +BuildRequires: python3-setuptools %endif %if %{with python2} @@ -149,7 +150,10 @@ popd %endif %changelog -* Mon May 07 2022 David Cantrell - 3.12.0-1 +* Mon Mar 07 2022 David Cantrell - 3.12.0-2 +- BR python3-setuptools + +* Mon Mar 07 2022 David Cantrell - 3.12.0-1 - Upgrade to pyparted-3.12.0 * Fri Jan 21 2022 Fedora Release Engineering - 1:3.11.7-5 From e8f5fc908955d472b952c8a75ef45bf8bca55f04 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 16:02:42 +0200 Subject: [PATCH 53/79] Rebuilt for Python 3.11 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 1debcf1..10d2c51 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -150,6 +150,9 @@ popd %endif %changelog +* Mon Jun 13 2022 Python Maint - 1:3.12.0-3 +- Rebuilt for Python 3.11 + * Mon Mar 07 2022 David Cantrell - 3.12.0-2 - BR python3-setuptools From d32b10b8773584669e196734e3d268b500b24879 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 20 Jun 2022 13:24:26 -0700 Subject: [PATCH 54/79] Backport PR #92 to fix tests with parted 3.5 (#2098792) --- ...ITION_TYPE-features-from-parted-3.5-.patch | 100 ++++++++++++++++++ pyparted.spec | 12 ++- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch diff --git a/0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch b/0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch new file mode 100644 index 0000000..9ba3c03 --- /dev/null +++ b/0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch @@ -0,0 +1,100 @@ +From e99993d1b80105906fdeecafc308e272b93a96c9 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Mon, 20 Jun 2022 11:00:54 -0700 +Subject: [PATCH] Support new PARTITION_TYPE features from parted 3.5 (#91) + +This adds constants for the new PARTITION_TYPE features added +in parted 3.5 (commit 61b3a9733c0e0a79ccc43096642d378c8706add6 ) +and adjusts the disk type tests to test for them correctly. + +Note this relies on being able to evaluate the +PED_DISK_TYPE_LAST_FEATURE macro at preprocessor time, which is +not the case with current upstream parted. See +https://github.com/dcantrell/pyparted/issues/91#issuecomment-1160788315 +for full details on this. The existing attempts to add constants +based on PED_PARTITION_LAST_FLAG in the same manner also do not +work with current upstream parted. + +Signed-off-by: Adam Williamson +--- + src/_pedmodule.c | 5 +++++ + src/parted/__init__.py | 8 ++++++++ + tests/test__ped_disktype.py | 18 +++++++++++++++--- + 3 files changed, 28 insertions(+), 3 deletions(-) + +diff --git a/src/_pedmodule.c b/src/_pedmodule.c +index 2d8ee1c..080e716 100644 +--- a/src/_pedmodule.c ++++ b/src/_pedmodule.c +@@ -685,6 +685,11 @@ MOD_INIT(_ped) { + PyModule_AddIntConstant(m, "DISK_TYPE_EXTENDED", PED_DISK_TYPE_EXTENDED); + PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_NAME", PED_DISK_TYPE_PARTITION_NAME); + ++#if PED_DISK_TYPE_LAST_FEATURE > 2 ++ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_ID", PED_DISK_TYPE_PARTITION_TYPE_ID); ++ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_UUID", PED_DISK_TYPE_PARTITION_TYPE_UUID); ++#endif ++ + /* add PedFileSystemType as _ped.FileSystemType */ + if (PyType_Ready(&_ped_FileSystemType_Type_obj) < 0) + return MOD_ERROR_VAL; +diff --git a/src/parted/__init__.py b/src/parted/__init__.py +index ef049ee..2397b84 100644 +--- a/src/parted/__init__.py ++++ b/src/parted/__init__.py +@@ -217,6 +217,14 @@ from _ped import DISK_GPT_PMBR_BOOT + from _ped import DISK_TYPE_EXTENDED + from _ped import DISK_TYPE_PARTITION_NAME + ++if hasattr(_ped, 'DISK_TYPE_PARTITION_TYPE_ID'): ++ # pylint: disable=E0611 ++ from _ped import DISK_TYPE_PARTITION_TYPE_ID ++ ++if hasattr(_ped, 'DISK_TYPE_PARTITION_TYPE_UUID'): ++ # pylint: disable=E0611 ++ from _ped import DISK_TYPE_PARTITION_TYPE_UUID ++ + from _ped import EXCEPTION_TYPE_INFORMATION + from _ped import EXCEPTION_TYPE_WARNING + from _ped import EXCEPTION_TYPE_ERROR +diff --git a/tests/test__ped_disktype.py b/tests/test__ped_disktype.py +index 8b768a3..0867d37 100755 +--- a/tests/test__ped_disktype.py ++++ b/tests/test__ped_disktype.py +@@ -68,18 +68,30 @@ class DiskTypeCheckFeatureTestCase(RequiresDiskTypes): + self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED)) + self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME)) + +- # The following types support all features ++ # The following types support both features + for name in ['dvh']: + self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED)) + self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME)) + ++ # With parted 3.5+, msdos supports PED_DISK_TYPE_PARTITION_TYPE_ID ++ # and gpt supports PED_DISK_TYPE_PARTITION_TYPE_UUID ++ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_ID"): ++ self.assertTrue(self.disktype["msdos"].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_ID)) ++ self.assertTrue(self.disktype["gpt"].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_UUID)) ++ + class DiskTypeStrTestCase(RequiresDiskTypes): + def runTest(self): +- self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 1') ++ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_ID"): ++ self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 5') ++ else: ++ self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 1') + self.assertEqual(str(self.disktype['aix']), '_ped.DiskType instance --\n name: aix features: 0') + self.assertEqual(str(self.disktype['sun']), '_ped.DiskType instance --\n name: sun features: 0') + self.assertEqual(str(self.disktype['amiga']), '_ped.DiskType instance --\n name: amiga features: 2') +- self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2') ++ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): ++ self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 10') ++ else: ++ self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2') + self.assertEqual(str(self.disktype['mac']), '_ped.DiskType instance --\n name: mac features: 2') + self.assertEqual(str(self.disktype['bsd']), '_ped.DiskType instance --\n name: bsd features: 0') + self.assertEqual(str(self.disktype['pc98']), '_ped.DiskType instance --\n name: pc98 features: 2') +-- +2.36.1 + diff --git a/pyparted.spec b/pyparted.spec index 10d2c51..fb34fea 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -43,6 +43,12 @@ Source1: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{n Source2: keyring.gpg Source3: trustdb.gpg +# Support new disk type features from parted 3.5: +# https://bugzilla.redhat.com/show_bug.cgi?id=2098792 +# https://github.com/dcantrell/pyparted/issues/91 +# https://github.com/dcantrell/pyparted/pull/92 +Patch0: 0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch + BuildRequires: make BuildRequires: gcc BuildRequires: parted-devel >= 3.3 @@ -93,6 +99,7 @@ partition tables. This package provides Python 3 bindings for parted. gpg --no-default-keyring --keyring %{SOURCE2} --trustdb-name %{SOURCE3} --verify %{SOURCE1} %{SOURCE0} || exit 1 %setup -q +%patch0 -p1 %if %{with python3} everything=$(ls) @@ -150,6 +157,9 @@ popd %endif %changelog +* Mon Jun 20 2022 Adam Williamson - 1:3.12.0-4 +- Backport PR #92 to fix tests with parted 3.5 (#2098792) + * Mon Jun 13 2022 Python Maint - 1:3.12.0-3 - Rebuilt for Python 3.11 From 52a1c8bfaff588ea87d22951768bba2e5181b975 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 21 Jun 2022 15:22:04 -0400 Subject: [PATCH 55/79] Patch pyparted to handle PED_DISK_TYPE_PARTITION_TYPE_ID for the msdos disk type and PED_DISK_TYPE_PARTITION_TYPE_UUID for the gpt label (#2098792) Signed-off-by: David Cantrell --- ...h => pyparted-3.12.0-partition-types.patch | 107 ++++++++---------- pyparted.spec | 10 +- 2 files changed, 53 insertions(+), 64 deletions(-) rename 0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch => pyparted-3.12.0-partition-types.patch (58%) diff --git a/0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch b/pyparted-3.12.0-partition-types.patch similarity index 58% rename from 0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch rename to pyparted-3.12.0-partition-types.patch index 9ba3c03..075c18e 100644 --- a/0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch +++ b/pyparted-3.12.0-partition-types.patch @@ -1,47 +1,6 @@ -From e99993d1b80105906fdeecafc308e272b93a96c9 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Mon, 20 Jun 2022 11:00:54 -0700 -Subject: [PATCH] Support new PARTITION_TYPE features from parted 3.5 (#91) - -This adds constants for the new PARTITION_TYPE features added -in parted 3.5 (commit 61b3a9733c0e0a79ccc43096642d378c8706add6 ) -and adjusts the disk type tests to test for them correctly. - -Note this relies on being able to evaluate the -PED_DISK_TYPE_LAST_FEATURE macro at preprocessor time, which is -not the case with current upstream parted. See -https://github.com/dcantrell/pyparted/issues/91#issuecomment-1160788315 -for full details on this. The existing attempts to add constants -based on PED_PARTITION_LAST_FLAG in the same manner also do not -work with current upstream parted. - -Signed-off-by: Adam Williamson ---- - src/_pedmodule.c | 5 +++++ - src/parted/__init__.py | 8 ++++++++ - tests/test__ped_disktype.py | 18 +++++++++++++++--- - 3 files changed, 28 insertions(+), 3 deletions(-) - -diff --git a/src/_pedmodule.c b/src/_pedmodule.c -index 2d8ee1c..080e716 100644 ---- a/src/_pedmodule.c -+++ b/src/_pedmodule.c -@@ -685,6 +685,11 @@ MOD_INIT(_ped) { - PyModule_AddIntConstant(m, "DISK_TYPE_EXTENDED", PED_DISK_TYPE_EXTENDED); - PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_NAME", PED_DISK_TYPE_PARTITION_NAME); - -+#if PED_DISK_TYPE_LAST_FEATURE > 2 -+ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_ID", PED_DISK_TYPE_PARTITION_TYPE_ID); -+ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_UUID", PED_DISK_TYPE_PARTITION_TYPE_UUID); -+#endif -+ - /* add PedFileSystemType as _ped.FileSystemType */ - if (PyType_Ready(&_ped_FileSystemType_Type_obj) < 0) - return MOD_ERROR_VAL; -diff --git a/src/parted/__init__.py b/src/parted/__init__.py -index ef049ee..2397b84 100644 ---- a/src/parted/__init__.py -+++ b/src/parted/__init__.py +diff -up pyparted-3.12.0/src/parted/__init__.py.orig pyparted-3.12.0/src/parted/__init__.py +--- pyparted-3.12.0/src/parted/__init__.py.orig 2022-03-07 12:38:56.000000000 -0500 ++++ pyparted-3.12.0/src/parted/__init__.py 2022-06-21 15:05:10.318939409 -0400 @@ -217,6 +217,14 @@ from _ped import DISK_GPT_PMBR_BOOT from _ped import DISK_TYPE_EXTENDED from _ped import DISK_TYPE_PARTITION_NAME @@ -57,26 +16,52 @@ index ef049ee..2397b84 100644 from _ped import EXCEPTION_TYPE_INFORMATION from _ped import EXCEPTION_TYPE_WARNING from _ped import EXCEPTION_TYPE_ERROR -diff --git a/tests/test__ped_disktype.py b/tests/test__ped_disktype.py -index 8b768a3..0867d37 100755 ---- a/tests/test__ped_disktype.py -+++ b/tests/test__ped_disktype.py -@@ -68,18 +68,30 @@ class DiskTypeCheckFeatureTestCase(RequiresDiskTypes): +diff -up pyparted-3.12.0/src/_pedmodule.c.orig pyparted-3.12.0/src/_pedmodule.c +--- pyparted-3.12.0/src/_pedmodule.c.orig 2022-03-07 12:49:11.000000000 -0500 ++++ pyparted-3.12.0/src/_pedmodule.c 2022-06-21 15:04:57.863977820 -0400 +@@ -685,6 +685,14 @@ MOD_INIT(_ped) { + PyModule_AddIntConstant(m, "DISK_TYPE_EXTENDED", PED_DISK_TYPE_EXTENDED); + PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_NAME", PED_DISK_TYPE_PARTITION_NAME); + ++#if PED_DISK_TYPE_LAST_FEATURE > 2 ++ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_ID", PED_DISK_TYPE_PARTITION_TYPE_ID); ++#endif ++ ++#if PED_DISK_TYPE_LAST_FEATURE > 4 ++ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_UUID", PED_DISK_TYPE_PARTITION_TYPE_UUID); ++#endif ++ + /* add PedFileSystemType as _ped.FileSystemType */ + if (PyType_Ready(&_ped_FileSystemType_Type_obj) < 0) + return MOD_ERROR_VAL; +diff -up pyparted-3.12.0/tests/test__ped_disktype.py.orig pyparted-3.12.0/tests/test__ped_disktype.py +--- pyparted-3.12.0/tests/test__ped_disktype.py.orig 2018-01-12 13:31:40.000000000 -0500 ++++ pyparted-3.12.0/tests/test__ped_disktype.py 2022-06-21 15:04:57.863977820 -0400 +@@ -63,11 +63,22 @@ class DiskTypeCheckFeatureTestCase(Requi + self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED)) + self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME)) + ++ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_ID"): ++ self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_ID)) ++ ++ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): ++ self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_UUID)) ++ + # The following types support DISK_TYPE_PARTITION_NAME + for name in ['amiga', 'gpt', 'mac', 'pc98']: self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED)) self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME)) -- # The following types support all features -+ # The following types support both features ++ # The following types support DISK_TYPE_PARTITION_TYPE_UUID ++ for name in ['gpt']: ++ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): ++ self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_UUID)) ++ + # The following types support all features for name in ['dvh']: self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED)) - self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME)) +@@ -75,11 +86,20 @@ class DiskTypeCheckFeatureTestCase(Requi -+ # With parted 3.5+, msdos supports PED_DISK_TYPE_PARTITION_TYPE_ID -+ # and gpt supports PED_DISK_TYPE_PARTITION_TYPE_UUID -+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_ID"): -+ self.assertTrue(self.disktype["msdos"].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_ID)) -+ self.assertTrue(self.disktype["gpt"].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_UUID)) -+ class DiskTypeStrTestCase(RequiresDiskTypes): def runTest(self): - self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 1') @@ -84,17 +69,17 @@ index 8b768a3..0867d37 100755 + self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 5') + else: + self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 1') ++ self.assertEqual(str(self.disktype['aix']), '_ped.DiskType instance --\n name: aix features: 0') self.assertEqual(str(self.disktype['sun']), '_ped.DiskType instance --\n name: sun features: 0') self.assertEqual(str(self.disktype['amiga']), '_ped.DiskType instance --\n name: amiga features: 2') - self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2') ++ + if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): + self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 10') + else: + self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2') ++ self.assertEqual(str(self.disktype['mac']), '_ped.DiskType instance --\n name: mac features: 2') self.assertEqual(str(self.disktype['bsd']), '_ped.DiskType instance --\n name: bsd features: 0') self.assertEqual(str(self.disktype['pc98']), '_ped.DiskType instance --\n name: pc98 features: 2') --- -2.36.1 - diff --git a/pyparted.spec b/pyparted.spec index fb34fea..fff5a38 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -46,8 +46,7 @@ Source3: trustdb.gpg # Support new disk type features from parted 3.5: # https://bugzilla.redhat.com/show_bug.cgi?id=2098792 # https://github.com/dcantrell/pyparted/issues/91 -# https://github.com/dcantrell/pyparted/pull/92 -Patch0: 0001-Support-new-PARTITION_TYPE-features-from-parted-3.5-.patch +Patch0: pyparted-3.12.0-partition-types.patch BuildRequires: make BuildRequires: gcc @@ -157,6 +156,11 @@ popd %endif %changelog +* Tue Jun 21 2022 David Cantrell - 1:3.12.0-5 +- Patch pyparted to handle PED_DISK_TYPE_PARTITION_TYPE_ID for the + msdos disk type and PED_DISK_TYPE_PARTITION_TYPE_UUID for the gpt + label (#2098792) + * Mon Jun 20 2022 Adam Williamson - 1:3.12.0-4 - Backport PR #92 to fix tests with parted 3.5 (#2098792) From b71463d9afb3ebd66059c327d789223c8b618a49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 15:50:35 +0000 Subject: [PATCH 56/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index fff5a38..20f6f96 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -156,6 +156,9 @@ popd %endif %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1:3.12.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jun 21 2022 David Cantrell - 1:3.12.0-5 - Patch pyparted to handle PED_DISK_TYPE_PARTITION_TYPE_ID for the msdos disk type and PED_DISK_TYPE_PARTITION_TYPE_UUID for the gpt From c779229780277b3144f4b60c5286bc6cc0f556e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 10:42:21 +0000 Subject: [PATCH 57/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 20f6f96..da6321c 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://github.com/dcantrell/pyparted @@ -156,6 +156,9 @@ popd %endif %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1:3.12.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1:3.12.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 6d94398a546bcc378ddcbb069dceb7264ee4d8a5 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 2 Mar 2023 12:01:05 -0500 Subject: [PATCH 58/79] Fix FTBFS with _ped.disktype test case for gpt (#2171656) Update License tag to SPDX expression Signed-off-by: David Cantrell --- pyparted-3.12.0-gpt-disktype-test.patch | 12 ++++++++++++ pyparted.spec | 11 +++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pyparted-3.12.0-gpt-disktype-test.patch diff --git a/pyparted-3.12.0-gpt-disktype-test.patch b/pyparted-3.12.0-gpt-disktype-test.patch new file mode 100644 index 0000000..5f27612 --- /dev/null +++ b/pyparted-3.12.0-gpt-disktype-test.patch @@ -0,0 +1,12 @@ +diff -up pyparted-3.12.0/tests/test__ped_disktype.py.orig pyparted-3.12.0/tests/test__ped_disktype.py +--- pyparted-3.12.0/tests/test__ped_disktype.py.orig 2023-03-02 09:08:37.322713489 -0500 ++++ pyparted-3.12.0/tests/test__ped_disktype.py 2023-03-02 09:10:06.248488694 -0500 +@@ -96,7 +96,7 @@ class DiskTypeStrTestCase(RequiresDiskTy + self.assertEqual(str(self.disktype['amiga']), '_ped.DiskType instance --\n name: amiga features: 2') + + if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): +- self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 10') ++ self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 58') + else: + self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2') + diff --git a/pyparted.spec b/pyparted.spec index da6321c..63d57e3 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,8 +34,8 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 7%{?dist} -License: GPLv2+ +Release: 8%{?dist} +License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted Source0: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz @@ -48,6 +48,8 @@ Source3: trustdb.gpg # https://github.com/dcantrell/pyparted/issues/91 Patch0: pyparted-3.12.0-partition-types.patch +Patch1: pyparted-3.12.0-gpt-disktype-test.patch + BuildRequires: make BuildRequires: gcc BuildRequires: parted-devel >= 3.3 @@ -99,6 +101,7 @@ gpg --no-default-keyring --keyring %{SOURCE2} --trustdb-name %{SOURCE3} --verify %setup -q %patch0 -p1 +%patch1 -p1 %if %{with python3} everything=$(ls) @@ -156,6 +159,10 @@ popd %endif %changelog +* Thu Mar 02 2023 David Cantrell - 1:3.12.0-8 +- Fix FTBFS with _ped.disktype test case for gpt (#2171656) +- Update License tag to SPDX expression + * Fri Jan 20 2023 Fedora Release Engineering - 1:3.12.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1f78cfc5daf748d15f82beda853da20a37c1defb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 21:37:29 +0200 Subject: [PATCH 59/79] Rebuilt for Python 3.12 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 63d57e3..c38fa40 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -159,6 +159,9 @@ popd %endif %changelog +* Tue Jun 13 2023 Python Maint - 1:3.12.0-9 +- Rebuilt for Python 3.12 + * Thu Mar 02 2023 David Cantrell - 1:3.12.0-8 - Fix FTBFS with _ped.disktype test case for gpt (#2171656) - Update License tag to SPDX expression From 305aca41de72e8ab6a36ed14b8f8c782f2ee0d0b Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 14 Jun 2023 11:12:32 -0400 Subject: [PATCH 60/79] Use non-deprecated syntax for the %patch macros Signed-off-by: David Cantrell --- pyparted.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index c38fa40..0eaaeb7 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -100,8 +100,8 @@ partition tables. This package provides Python 3 bindings for parted. gpg --no-default-keyring --keyring %{SOURCE2} --trustdb-name %{SOURCE3} --verify %{SOURCE1} %{SOURCE0} || exit 1 %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 %if %{with python3} everything=$(ls) @@ -159,6 +159,9 @@ popd %endif %changelog +* Wed Jun 14 2023 David Cantrell - 1:3.12.0-10 +- Use non-deprecated syntax for the %%patch macros + * Tue Jun 13 2023 Python Maint - 1:3.12.0-9 - Rebuilt for Python 3.12 From 5cc8e359daa410ca571adc6c923085010aa5345c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 15:07:14 +0200 Subject: [PATCH 61/79] Rebuilt for Python 3.12 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 0eaaeb7..e1ebdbe 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -34,7 +34,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.12.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -159,6 +159,9 @@ popd %endif %changelog +* Thu Jun 15 2023 Python Maint - 1:3.12.0-11 +- Rebuilt for Python 3.12 + * Wed Jun 14 2023 David Cantrell - 1:3.12.0-10 - Use non-deprecated syntax for the %%patch macros From a4238a2a1228d0a0709fe9b7d5502275f7946cd0 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 22 Jun 2023 07:19:58 -0400 Subject: [PATCH 62/79] Upgrade to pyparted-3.13.0 Signed-off-by: David Cantrell --- .gitignore | 2 + pyparted-3.12.0-gpt-disktype-test.patch | 12 -- pyparted-3.12.0-partition-types.patch | 85 -------------- pyparted.spec | 147 ++++-------------------- sources | 4 +- 5 files changed, 27 insertions(+), 223 deletions(-) delete mode 100644 pyparted-3.12.0-gpt-disktype-test.patch delete mode 100644 pyparted-3.12.0-partition-types.patch diff --git a/.gitignore b/.gitignore index ced5e17..58dd8ea 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /pyparted-3.11.7.tar.gz.asc /pyparted-3.12.0.tar.gz /pyparted-3.12.0.tar.gz.asc +/pyparted-3.13.0.tar.gz +/pyparted-3.13.0.tar.gz.asc diff --git a/pyparted-3.12.0-gpt-disktype-test.patch b/pyparted-3.12.0-gpt-disktype-test.patch deleted file mode 100644 index 5f27612..0000000 --- a/pyparted-3.12.0-gpt-disktype-test.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up pyparted-3.12.0/tests/test__ped_disktype.py.orig pyparted-3.12.0/tests/test__ped_disktype.py ---- pyparted-3.12.0/tests/test__ped_disktype.py.orig 2023-03-02 09:08:37.322713489 -0500 -+++ pyparted-3.12.0/tests/test__ped_disktype.py 2023-03-02 09:10:06.248488694 -0500 -@@ -96,7 +96,7 @@ class DiskTypeStrTestCase(RequiresDiskTy - self.assertEqual(str(self.disktype['amiga']), '_ped.DiskType instance --\n name: amiga features: 2') - - if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): -- self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 10') -+ self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 58') - else: - self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2') - diff --git a/pyparted-3.12.0-partition-types.patch b/pyparted-3.12.0-partition-types.patch deleted file mode 100644 index 075c18e..0000000 --- a/pyparted-3.12.0-partition-types.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -up pyparted-3.12.0/src/parted/__init__.py.orig pyparted-3.12.0/src/parted/__init__.py ---- pyparted-3.12.0/src/parted/__init__.py.orig 2022-03-07 12:38:56.000000000 -0500 -+++ pyparted-3.12.0/src/parted/__init__.py 2022-06-21 15:05:10.318939409 -0400 -@@ -217,6 +217,14 @@ from _ped import DISK_GPT_PMBR_BOOT - from _ped import DISK_TYPE_EXTENDED - from _ped import DISK_TYPE_PARTITION_NAME - -+if hasattr(_ped, 'DISK_TYPE_PARTITION_TYPE_ID'): -+ # pylint: disable=E0611 -+ from _ped import DISK_TYPE_PARTITION_TYPE_ID -+ -+if hasattr(_ped, 'DISK_TYPE_PARTITION_TYPE_UUID'): -+ # pylint: disable=E0611 -+ from _ped import DISK_TYPE_PARTITION_TYPE_UUID -+ - from _ped import EXCEPTION_TYPE_INFORMATION - from _ped import EXCEPTION_TYPE_WARNING - from _ped import EXCEPTION_TYPE_ERROR -diff -up pyparted-3.12.0/src/_pedmodule.c.orig pyparted-3.12.0/src/_pedmodule.c ---- pyparted-3.12.0/src/_pedmodule.c.orig 2022-03-07 12:49:11.000000000 -0500 -+++ pyparted-3.12.0/src/_pedmodule.c 2022-06-21 15:04:57.863977820 -0400 -@@ -685,6 +685,14 @@ MOD_INIT(_ped) { - PyModule_AddIntConstant(m, "DISK_TYPE_EXTENDED", PED_DISK_TYPE_EXTENDED); - PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_NAME", PED_DISK_TYPE_PARTITION_NAME); - -+#if PED_DISK_TYPE_LAST_FEATURE > 2 -+ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_ID", PED_DISK_TYPE_PARTITION_TYPE_ID); -+#endif -+ -+#if PED_DISK_TYPE_LAST_FEATURE > 4 -+ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_UUID", PED_DISK_TYPE_PARTITION_TYPE_UUID); -+#endif -+ - /* add PedFileSystemType as _ped.FileSystemType */ - if (PyType_Ready(&_ped_FileSystemType_Type_obj) < 0) - return MOD_ERROR_VAL; -diff -up pyparted-3.12.0/tests/test__ped_disktype.py.orig pyparted-3.12.0/tests/test__ped_disktype.py ---- pyparted-3.12.0/tests/test__ped_disktype.py.orig 2018-01-12 13:31:40.000000000 -0500 -+++ pyparted-3.12.0/tests/test__ped_disktype.py 2022-06-21 15:04:57.863977820 -0400 -@@ -63,11 +63,22 @@ class DiskTypeCheckFeatureTestCase(Requi - self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED)) - self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME)) - -+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_ID"): -+ self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_ID)) -+ -+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): -+ self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_UUID)) -+ - # The following types support DISK_TYPE_PARTITION_NAME - for name in ['amiga', 'gpt', 'mac', 'pc98']: - self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED)) - self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME)) - -+ # The following types support DISK_TYPE_PARTITION_TYPE_UUID -+ for name in ['gpt']: -+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): -+ self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_UUID)) -+ - # The following types support all features - for name in ['dvh']: - self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED)) -@@ -75,11 +86,20 @@ class DiskTypeCheckFeatureTestCase(Requi - - class DiskTypeStrTestCase(RequiresDiskTypes): - def runTest(self): -- self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 1') -+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_ID"): -+ self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 5') -+ else: -+ self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 1') -+ - self.assertEqual(str(self.disktype['aix']), '_ped.DiskType instance --\n name: aix features: 0') - self.assertEqual(str(self.disktype['sun']), '_ped.DiskType instance --\n name: sun features: 0') - self.assertEqual(str(self.disktype['amiga']), '_ped.DiskType instance --\n name: amiga features: 2') -- self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2') -+ -+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"): -+ self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 10') -+ else: -+ self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2') -+ - self.assertEqual(str(self.disktype['mac']), '_ped.DiskType instance --\n name: mac features: 2') - self.assertEqual(str(self.disktype['bsd']), '_ped.DiskType instance --\n name: bsd features: 0') - self.assertEqual(str(self.disktype['pc98']), '_ped.DiskType instance --\n name: pc98 features: 2') diff --git a/pyparted.spec b/pyparted.spec index e1ebdbe..8d47076 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -1,164 +1,63 @@ -%if 0%{?rhel} -%if %{rhel} <= 7 -# disable python3 by default -%bcond_with python3 -%else -%bcond_without python3 -%endif +Summary: Python module for GNU parted +Name: pyparted +Epoch: 1 +Version: 3.13.0 +Release: 1%{?dist} +License: GPL-2.0-or-later +URL: https://github.com/dcantrell/pyparted -%if %{rhel} > 7 -# disable python2 by default -%bcond_with python2 -%else -%bcond_without python2 -%endif -%endif - -%if 0%{?fedora} -%if %{fedora} < 23 -# disable python3 by default -%bcond_with python3 -%else -%bcond_without python3 -%endif - -%if %{fedora} > 31 -# disable python2 by default -%bcond_with python2 -%else -%bcond_without python2 -%endif -%endif - -Summary: Python module for GNU parted -Name: pyparted -Epoch: 1 -Version: 3.12.0 -Release: 11%{?dist} -License: GPL-2.0-or-later -URL: https://github.com/dcantrell/pyparted - -Source0: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc -Source2: keyring.gpg -Source3: trustdb.gpg - -# Support new disk type features from parted 3.5: -# https://bugzilla.redhat.com/show_bug.cgi?id=2098792 -# https://github.com/dcantrell/pyparted/issues/91 -Patch0: pyparted-3.12.0-partition-types.patch - -Patch1: pyparted-3.12.0-gpt-disktype-test.patch +Source0: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source1: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc +Source2: keyring.gpg +Source3: trustdb.gpg BuildRequires: make BuildRequires: gcc -BuildRequires: parted-devel >= 3.3 +BuildRequires: parted-devel >= 3.4 BuildRequires: pkgconfig BuildRequires: e2fsprogs BuildRequires: gnupg2 - -%if %{with python3} BuildRequires: python3-devel BuildRequires: python3-six BuildRequires: python3-setuptools -%endif -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-six -%endif - -%global _description\ -Python module for the parted library. It is used for manipulating\ +%description +Python module for the parted library. It is used for manipulating partition tables. -%description %_description - -%if %{with python2} -%package -n python2-pyparted -Summary: %summary -%{?python_provide:%python_provide python2-pyparted} -# Remove before F30 -Provides: pyparted = %{epoch}:%{version}-%{release} -Provides: pyparted%{?_isa} = %{epoch}:%{version}-%{release} -Obsoletes: pyparted < %{epoch}:%{version}-%{release} - -%description -n python2-pyparted %_description -%endif - -%if %{with python3} %package -n python3-pyparted Summary: Python 3 module for GNU parted %description -n python3-pyparted Python module for the parted library. It is used for manipulating partition tables. This package provides Python 3 bindings for parted. -%endif %prep # Verify source archive signature gpg --no-default-keyring --keyring %{SOURCE2} --trustdb-name %{SOURCE3} --verify %{SOURCE1} %{SOURCE0} || exit 1 -%setup -q -%patch -P 0 -p1 -%patch -P 1 -p1 - -%if %{with python3} -everything=$(ls) -mkdir -p py3dir -cp -a $everything py3dir -%endif +%autosetup %build -%if %{with python2} -PYTHON=python2 %make_build CFLAGS="%{optflags} -fcommon" -%endif - -%if %{with python3} -pushd py3dir -PYTHON=python3 %make_build CFLAGS="%{optflags} -fcommon" -popd -%endif +%make_build CFLAGS="%{optflags} -fcommon" %check -%if %{with python2} -PYTHON=python2 make test -%endif - -%if %{with python3} -pushd py3dir -PYTHON=python3 make test -popd -%endif +make test %install -%if %{with python2} -PYTHON=python2 %make_install -%endif +%make_install -%if %{with python3} -pushd py3dir -PYTHON=python3 %make_install -popd -%endif - -%if %{with python2} -%files -n python2-pyparted -%doc AUTHORS COPYING NEWS README TODO -%{python2_sitearch}/_ped.so -%{python2_sitearch}/parted -%{python2_sitearch}/%{name}-%{version}-*.egg-info -%endif - -%if %{with python3} %files -n python3-pyparted -%doc AUTHORS COPYING NEWS README TODO +%doc AUTHORS HACKING NEWS README.md RELEASE TODO +%license LICENSE %{python3_sitearch}/_ped.*.so %{python3_sitearch}/parted %{python3_sitearch}/%{name}-%{version}-*.egg-info -%endif %changelog +* Wed Jun 21 2023 David Cantrell - 1:3.13.0-1 +- Upgrade to pyparted-3.13.0 + * Thu Jun 15 2023 Python Maint - 1:3.12.0-11 - Rebuilt for Python 3.12 diff --git a/sources b/sources index 7f89792..39be172 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (pyparted-3.12.0.tar.gz) = 0179e5334be8c04287b10b47d407ad339933cd3e20514d2142fe968acf8a36c40e541ee5165e2b3699a40b133d8f1948d8d12ccf307d3a1736090fb33f28b7e7 -SHA512 (pyparted-3.12.0.tar.gz.asc) = 452d386fbc8b84fa0dc186bb75c6c12eb051c8a37575e5a3a0cf504d13c4b2a0134d7e486928f9af7d142d25802bda05c97fd95ff80721ae6f6c0abedb8b1614 +SHA512 (pyparted-3.13.0.tar.gz) = a9162afdbee48de5474de98ae8c08df028d485e122fcafae8421dddd47c9ed00d8dd9f40d854b14d4582483d8ea3469128a912491371385e4f18a0dbbbafbfd5 +SHA512 (pyparted-3.13.0.tar.gz.asc) = 6f3e973b52584450c3eed97d64266df832d8820a6a72f731fbb9fbd9be06f93f2d53b47bcae01b78a831e3e3cedca3ae8629dc5f9fe35dcc3ed11226a11fd952 From 560c551e0cba178e8fb34be0b796aa9ba5f9dc7d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 22 Jun 2023 14:22:46 +0200 Subject: [PATCH 63/79] Rebuilt for Python 3.12 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 8d47076..111be2c 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -55,6 +55,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Thu Jun 22 2023 Python Maint - 1:3.13.0-2 +- Rebuilt for Python 3.12 + * Wed Jun 21 2023 David Cantrell - 1:3.13.0-1 - Upgrade to pyparted-3.13.0 From 68b2466ffd8b7471694835d9b0f5f2b1fbeb4e7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 06:46:37 +0000 Subject: [PATCH 64/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 111be2c..190e231 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -55,6 +55,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1:3.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 22 2023 Python Maint - 1:3.13.0-2 - Rebuilt for Python 3.12 From b43cea136d3d99417cbb112c32cac0877b053036 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 22:47:14 +0000 Subject: [PATCH 65/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 190e231..fe20a52 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -55,6 +55,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1:3.13.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1:3.13.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 28afbe941526da1816ea5c18fbbbb08cdd64d419 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 00:38:54 +0000 Subject: [PATCH 66/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index fe20a52..87309cd 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -55,6 +55,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1:3.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1:3.13.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2164058f9515e852d5bada52d98089914b9161e8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:50:44 +0200 Subject: [PATCH 67/79] Rebuilt for Python 3.13 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 87309cd..af3c28e 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -55,6 +55,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Fri Jun 07 2024 Python Maint - 1:3.13.0-6 +- Rebuilt for Python 3.13 + * Fri Jan 26 2024 Fedora Release Engineering - 1:3.13.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7db2b45750f5f0b74a2586a1491683b5f31c2781 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 08:56:04 +0000 Subject: [PATCH 68/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index af3c28e..efcea27 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -55,6 +55,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1:3.13.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 1:3.13.0-6 - Rebuilt for Python 3.13 From a5d5cf52a2ab9bae79ef95b426307539a1c6e7b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 11:17:57 +0000 Subject: [PATCH 69/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index efcea27..0ce4215 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -55,6 +55,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1:3.13.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 1:3.13.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f6172d0db0522264fcf0dc2b87a2fbf059f812fe Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 21:23:35 +0200 Subject: [PATCH 70/79] Rebuilt for Python 3.14 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 0ce4215..d6e9ec4 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -55,6 +55,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Mon Jun 02 2025 Python Maint - 1:3.13.0-9 +- Rebuilt for Python 3.14 + * Sat Jan 18 2025 Fedora Release Engineering - 1:3.13.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f5a2e7a5d463740b88228784229e96fc7b40b1ce Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 15 Jun 2025 12:59:28 -0400 Subject: [PATCH 71/79] Drop unused six dependency six is unused as of 3.13.0: https://github.com/dcantrell/pyparted/commit/2f58eaea26773cd14ec0407f06b9c699abf47a8a --- pyparted.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index d6e9ec4..1f42611 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -18,7 +18,6 @@ BuildRequires: pkgconfig BuildRequires: e2fsprogs BuildRequires: gnupg2 BuildRequires: python3-devel -BuildRequires: python3-six BuildRequires: python3-setuptools %description @@ -55,6 +54,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Sun Jun 15 2025 Yaakov Selkowitz - 1:3.13.0-10 +- Drop unused six dependency + * Mon Jun 02 2025 Python Maint - 1:3.13.0-9 - Rebuilt for Python 3.14 From e753df8da255df179a032b60af04b6c4adf3410b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:23:09 +0000 Subject: [PATCH 72/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 1f42611..f7ed7f8 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -54,6 +54,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:3.13.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jun 15 2025 Yaakov Selkowitz - 1:3.13.0-10 - Drop unused six dependency From d5724a4b259ddc57ebf1ed22e6deff2087e5bcf1 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 23 Jul 2025 15:00:35 -0700 Subject: [PATCH 73/79] tests: Move pyparted tests from sti to tmt This converts to using tmt style tests, and adds a test that actually uses the installed pyparted library to manipulate a temporary disk image. Resolves: rhbz#2383021 --- .fmf/version | 1 + plans/run-tests.fmf | 9 ++++ tests/scripts/pyparted-tests | 88 ++++++++++++++++++++++++++++++++++++ tests/scripts/run_tests.sh | 29 ------------ tests/tests.yml | 15 ------ 5 files changed, 98 insertions(+), 44 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/run-tests.fmf create mode 100755 tests/scripts/pyparted-tests delete mode 100755 tests/scripts/run_tests.sh delete mode 100644 tests/tests.yml 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/plans/run-tests.fmf b/plans/run-tests.fmf new file mode 100644 index 0000000..cf8a582 --- /dev/null +++ b/plans/run-tests.fmf @@ -0,0 +1,9 @@ +summary: Run pyparted tests +prepare: + how: install + package: + - python3-pyparted +execute: + script: | + fallocate -l 1G $PWD/disk.img + ./tests/scripts/pyparted-tests $PWD/disk.img diff --git a/tests/scripts/pyparted-tests b/tests/scripts/pyparted-tests new file mode 100755 index 0000000..8edcca1 --- /dev/null +++ b/tests/scripts/pyparted-tests @@ -0,0 +1,88 @@ +#!/usr/bin/python3 + +import parted +import sys + + +def init_disk(disk_img): + # Make a disklabel (failures here will raise an error) + dev = parted.getDevice(disk_img) + disk = parted.freshDisk(dev, "gpt") + + # Make a partition + geom = parted.Geometry(device=dev, + start=2048, + end=50*2048) + fs = parted.FileSystem(type="ext4", geometry=geom) + part = parted.Partition(disk=disk, + type=parted.PARTITION_NORMAL, + fs=fs, + geometry=geom) + disk.addPartition(partition=part, + constraint=dev.optimalAlignedConstraint) + part.setFlag(parted.PARTITION_BOOT) + disk.commit() + +def read_disk(disk_img): + # Read the disk and check the partitions + dev = parted.getDevice(disk_img) + disk = parted.newDisk(dev) + + if dev.length == 0: + print("ERROR: Disk has no length", file=sys.stderr) + sys.exit(1) + + if len(disk.partitions) != 1: + print("ERROR: Wrong number of partitions", file=sys.stderr) + sys.exit(1) + + part = disk.partitions[0] + if part.geometry.end != 50*2048: + print("ERROR: Partition is wrong length", file=sys.stderr) + sys.exit(1) + + if part.geometry.start != 2048: + print("ERROR: Parition doesn't start at sector 2048", file=sys.stderr) + sys.exit(1) + + +def remove_partition(disk_img): + # Remove partition and check disk + dev = parted.getDevice(disk_img) + disk = parted.newDisk(dev) + + if len(disk.partitions) != 1: + print("ERROR: Wrong number of partitions", file=sys.stderr) + sys.exit(1) + + disk.removePartition(partition=disk.partitions[0]) + disk.commit() + + dev = parted.getDevice(disk_img) + disk = parted.newDisk(dev) + + if len(disk.partitions) != 0: + print("ERROR: Failed to delete partition", file=sys.stderr) + sys.exit(1) + + +def main(disk_img): + print(f"Running tests on {disk_img}") + + try: + init_disk(disk_img) + read_disk(disk_img) + remove_partition(disk_img) + except Exception as e: + print(f"ERROR: {str(e)}", file=sys.stderr) + sys.exit(1) + + print("PASS", file=sys.stderr) + sys.exit(0) + +if __name__ == '__main__': + if len(sys.argv) < 2: + print("Usage: %s " % sys.argv[0], file=sys.stderr) + sys.exit(1) + + main(sys.argv[1]) diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh deleted file mode 100755 index 21804db..0000000 --- a/tests/scripts/run_tests.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -PATH=/usr/bin -TMPDIR="$(mktemp -d)" -CWD="$(pwd)" - -PACKAGE=pyparted -BRANCH= - -# clone the dist-git tree for this package -cd ${TMPDIR} -fedpkg co ${PACKAGE} -cd ${PACKAGE} -[ -z "${BRANCH}" ] || fedpkg switch-branch ${BRANCH} -fedpkg prep - -# scramble together the extracted source tree name -SRCDIR="${PACKAGE}-$(grep Version: ${PACKAGE}.spec | cut -d ' ' -f 2)" - -# run the tests -cd ${SRCDIR} -#make check # this runs pylint, which is sometimes wrong/noisy -make test -RET=$? - -# clean up and exit -cd ${CWD} -rm -rf ${TMPDIR} -exit ${RET} diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 171d4d0..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- - -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - - required_packages: - - fedpkg - - tests: - - simple: - dir: scripts/ - run: ./run_tests.sh From bd307c7d69a015eb1371b3ea7380653c7d24a139 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:09:13 +0200 Subject: [PATCH 74/79] Rebuilt for Python 3.14.0rc2 bytecode --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index f7ed7f8..cf6cd09 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -54,6 +54,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Fri Aug 15 2025 Python Maint - 1:3.13.0-12 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 1:3.13.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2e82ee90f003a56fbbcf3893247e32f8b398a57d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:40:14 +0200 Subject: [PATCH 75/79] Rebuilt for Python 3.14.0rc3 bytecode --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index cf6cd09..a6d63a7 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -54,6 +54,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Fri Sep 19 2025 Python Maint - 1:3.13.0-13 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1:3.13.0-12 - Rebuilt for Python 3.14.0rc2 bytecode From 0ad0fbeef9a20fce8025f20cd01bfd6a48441498 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 06:00:48 +0000 Subject: [PATCH 76/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index a6d63a7..751923e 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -54,6 +54,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1:3.13.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Sep 19 2025 Python Maint - 1:3.13.0-13 - Rebuilt for Python 3.14.0rc3 bytecode From df740093ccc535b125e09e03acd476bcc7ef1850 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 17:46:10 +0200 Subject: [PATCH 77/79] Rebuilt for Python 3.15 --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 751923e..4c52b45 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -54,6 +54,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Wed Jun 03 2026 Python Maint - 1:3.13.0-15 +- Rebuilt for Python 3.15 + * Sat Jan 17 2026 Fedora Release Engineering - 1:3.13.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From d1e72e367715cb2dc1382378b96aaad86d703db0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 17:55:18 +0000 Subject: [PATCH 78/79] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 4c52b45..5775ce1 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -54,6 +54,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Thu Jul 16 2026 Fedora Release Engineering - 1:3.13.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Wed Jun 03 2026 Python Maint - 1:3.13.0-15 - Rebuilt for Python 3.15 From f00b886f17cea03b03df51eefce8446efd6b2680 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:51:18 +0200 Subject: [PATCH 79/79] Rebuilt for Python 3.15.0b4 ABI change --- pyparted.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyparted.spec b/pyparted.spec index 5775ce1..ad79d71 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -2,7 +2,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.13.0 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL-2.0-or-later URL: https://github.com/dcantrell/pyparted @@ -54,6 +54,9 @@ make test %{python3_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Wed Jul 22 2026 Python Maint - 1:3.13.0-17 +- Rebuilt for Python 3.15.0b4 ABI change + * Thu Jul 16 2026 Fedora Release Engineering - 1:3.13.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild