Skip to content

Commit 3b2e6e4

Browse files
authored
Upgrade: pyparted to version 3.58 (#11613)
1 parent d39c248 commit 3b2e6e4

6 files changed

Lines changed: 132 additions & 103 deletions

File tree

4.45 KB
Binary file not shown.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
3+
iQIzBAABCgAdFiEECPfIs8YhlQwTj3ZhYpd7uchBuWUFAmSTMCwACgkQYpd7uchB
4+
uWUcOBAAgASbpACsIET1xcvHEkPl38xJTYG92KvhzyWdcgNbONRfp0VSKt8SuByb
5+
ysQkiJ7bg/oneogrr8hy/W018YHxY3ZvtHp3+y9GlaF4UAN6b8PMoqAICKU6GDBo
6+
hJlkpZDZFqCiLnRM/ShswqrQguI3XzN/gvUKBkr7kSx0p50tyQnMNnusvYJtPAvK
7+
TnyrkwCkyGhn/3Bd8jvDnuA6T5WLtVSWKDEbk4P9mvu+YFdfTeK+08+ltCru5gUH
8+
kcNU3f0CdMItunTKl4xqrFTYuUfPHjtEzJo95usO4mOrXoh67qWY0VQGcXrlgw83
9+
eHmn6d+W7E8Xjn7NH2vq9I+xIKyiFAh3sUOKQ7Kw7qGuhQu0B5kEaCUYQk/UC2CF
10+
LbDnOElNVbzMiYom196PLr7bpp8JRhH3jp7MDCC7W2jN9TtUR79dZnbyATdT/Ilj
11+
eqFn81bO+O+JZ7bebmfcp4nOcOH4154OH1mhSgCN0PEy+cECYeMaW08lqhgX+3yj
12+
Fjm8DVgJN76yL/DAIwoGZN7nzJdCvSjO0dBk5qaqMT/iSvoZPjavlVjfmnIhM0qc
13+
GNSjyrHVc+dAyooNX2hoL60B64OIoSMxc5z2daf2HM3YtgugWcE3kqdEEfZhqi1U
14+
+x3bPbAc4298JO8Pd5w7c9Zz5hXcS4z+n/VXLxwG8sWB2raDsXs=
15+
=f59d
16+
-----END PGP SIGNATURE-----
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"Signatures": {
33
"keyring.gpg": "f3523e7f78a16339d0aa5020e53a6f02b9d79b56d9d2750adf70cc5fea1f8268",
4-
"pyparted-3.11.4.tar.gz": "553a84155512bb5bd1382151bd689002bf7ceeacf86436b5fb2446d47ec55e98",
5-
"pyparted-3.11.4.tar.gz.asc": "2b45e5e5e15f9d5cf117a28bb411e11a99e19d9016b6c347e24a57b44445133b",
4+
"pyparted-3.13.0.tar.gz": "8fc6758abd16c7b0429fd4c07b6a7672678d493bfe1811040cd77d45e04964ea",
5+
"pyparted-3.13.0.tar.gz.asc": "5d23cced3ced5ed45276b48cf53f4250d28028cc23279c9c347ffb48fb0e5c9d",
66
"trustdb.gpg": "6724142955dd6c759195cbc66b4ac11613849123a50f4a5ca7b08dc1008bdd96"
77
}
88
}

SPECS-EXTENDED/pyparted/pyparted.spec

Lines changed: 112 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1,139 +1,152 @@
11
Vendor: Microsoft Corporation
22
Distribution: Azure Linux
3-
4-
%bcond_without python3
5-
6-
%bcond_with python2
7-
8-
Summary: Python module for GNU parted
9-
Name: pyparted
10-
Version: 3.11.4
11-
Release: 4%{?dist}
12-
License: GPLv2+
13-
URL: https://github.com/dcantrell/pyparted
14-
15-
Source0: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz
16-
Source1: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
17-
Source2: keyring.gpg
18-
Source3: trustdb.gpg
19-
3+
Summary: Python module for GNU parted
4+
Name: pyparted
5+
Version: 3.13.0
6+
Release: 8%{?dist}
7+
License: GPL-2.0-or-later
8+
URL: https://github.com/dcantrell/pyparted
9+
10+
Source0: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz
11+
Source1: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
12+
Source2: keyring.gpg
13+
Source3: trustdb.gpg
14+
15+
BuildRequires: make
2016
BuildRequires: gcc
21-
BuildRequires: parted-devel >= 3.2-18
17+
BuildRequires: parted-devel >= 3.4
2218
BuildRequires: pkgconfig
2319
BuildRequires: e2fsprogs
2420
BuildRequires: gnupg2
25-
26-
%if %{with python3}
2721
BuildRequires: python3-devel
2822
BuildRequires: python3-six
29-
%endif
30-
31-
%if %{with python2}
32-
BuildRequires: python2-devel
33-
BuildRequires: python2-six
34-
%endif
23+
BuildRequires: python3-setuptools
3524

36-
%global _description\
37-
Python module for the parted library. It is used for manipulating\
25+
%description
26+
Python module for the parted library. It is used for manipulating
3827
partition tables.
3928

40-
%description %_description
41-
42-
%if %{with python2}
43-
%package -n python2-pyparted
44-
Summary: %summary
45-
%{?python_provide:%python_provide python2-pyparted}
46-
# Remove before F30
47-
Provides: pyparted = %{version}-%{release}
48-
Provides: pyparted%{?_isa} = %{version}-%{release}
49-
Obsoletes: pyparted < %{version}-%{release}
50-
51-
%description -n python2-pyparted %_description
52-
%endif
53-
54-
%if %{with python3}
5529
%package -n python3-pyparted
5630
Summary: Python 3 module for GNU parted
5731

5832
%description -n python3-pyparted
5933
Python module for the parted library. It is used for manipulating
6034
partition tables. This package provides Python 3 bindings for parted.
61-
%endif
6235

6336
%prep
6437
# Verify source archive signature
65-
# Remove "use-keyboxd" from gnupg configuration; if present, since it will wait forever if the service is not running
66-
sed -i '/use-keyboxd/d' ~/.gnupg/common.conf
6738
gpg --no-default-keyring --keyring %{SOURCE2} --trustdb-name %{SOURCE3} --verify %{SOURCE1} %{SOURCE0} || exit 1
6839

69-
%setup -q
70-
71-
%if %{with python3}
72-
everything=$(ls)
73-
mkdir -p py3dir
74-
cp -a $everything py3dir
75-
%endif
40+
%autosetup
7641

7742
%build
78-
%if %{with python2}
79-
PYTHON=python2 make %{?_smp_mflags} CFLAGS="%{optflags} -fcommon"
80-
%endif
81-
82-
%if %{with python3}
83-
pushd py3dir
84-
PYTHON=python3 make %{?_smp_mflags} CFLAGS="%{optflags} -fcommon"
85-
popd
86-
%endif
43+
%make_build CFLAGS="%{optflags} -fcommon"
8744

8845
%check
89-
%if %{with python2}
90-
PYTHON=python2 make test
91-
%endif
92-
93-
%if %{with python3}
94-
pushd py3dir
95-
PYTHON=python3 make test
96-
popd
97-
%endif
46+
make test
9847

9948
%install
100-
%if %{with python2}
101-
PYTHON=python2 make install DESTDIR=%{buildroot}
102-
%endif
103-
104-
%if %{with python3}
105-
pushd py3dir
106-
PYTHON=python3 make install DESTDIR=%{buildroot}
107-
popd
108-
%endif
109-
110-
%if %{with python2}
111-
%files -n python2-pyparted
112-
%doc AUTHORS COPYING NEWS README TODO
113-
%{python2_sitearch}/_ped.so
114-
%{python2_sitearch}/parted
115-
%{python2_sitearch}/%{name}-%{version}-*.egg-info
116-
%endif
117-
118-
%if %{with python3}
49+
%make_install
50+
11951
%files -n python3-pyparted
120-
%doc AUTHORS COPYING NEWS README TODO
52+
%doc AUTHORS HACKING NEWS README.md RELEASE TODO
53+
%license LICENSE
12154
%{python3_sitearch}/_ped.*.so
12255
%{python3_sitearch}/parted
12356
%{python3_sitearch}/%{name}-%{version}-*.egg-info
124-
%endif
12557

12658
%changelog
127-
* Mon Dec 04 2023 Andrew Phelps <anphel@microsoft.com> - 3.11.4-4
128-
- Fix build issue with gpg keyboxd
59+
* Wed Dec 18 2024 Sumit Jena <v-sumitjena@microsoft.com> - 3.13.0-8
60+
- Initial Azure Linux import from Fedora 41 (license: MIT).
12961
- License verified.
13062

131-
* Mon Nov 01 2021 Muhammad Falak <mwani@microsoft.com> - 3.11.4-3
132-
- Remove epoch
63+
* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.13.0-7
64+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
65+
66+
* Fri Jun 07 2024 Python Maint <python-maint@redhat.com> - 1:3.13.0-6
67+
- Rebuilt for Python 3.13
68+
69+
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.13.0-5
70+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
71+
72+
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.13.0-4
73+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
74+
75+
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.13.0-3
76+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
77+
78+
* Thu Jun 22 2023 Python Maint <python-maint@redhat.com> - 1:3.13.0-2
79+
- Rebuilt for Python 3.12
80+
81+
* Wed Jun 21 2023 David Cantrell <dcantrell@redhat.com> - 1:3.13.0-1
82+
- Upgrade to pyparted-3.13.0
83+
84+
* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 1:3.12.0-11
85+
- Rebuilt for Python 3.12
86+
87+
* Wed Jun 14 2023 David Cantrell <dcantrell@redhat.com> - 1:3.12.0-10
88+
- Use non-deprecated syntax for the %%patch macros
89+
90+
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1:3.12.0-9
91+
- Rebuilt for Python 3.12
92+
93+
* Thu Mar 02 2023 David Cantrell <dcantrell@redhat.com> - 1:3.12.0-8
94+
- Fix FTBFS with _ped.disktype test case for gpt (#2171656)
95+
- Update License tag to SPDX expression
96+
97+
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.12.0-7
98+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
99+
100+
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.12.0-6
101+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
102+
103+
* Tue Jun 21 2022 David Cantrell <dcantrell@redhat.com> - 1:3.12.0-5
104+
- Patch pyparted to handle PED_DISK_TYPE_PARTITION_TYPE_ID for the
105+
msdos disk type and PED_DISK_TYPE_PARTITION_TYPE_UUID for the gpt
106+
label (#2098792)
107+
108+
* Mon Jun 20 2022 Adam Williamson <awilliam@redhat.com> - 1:3.12.0-4
109+
- Backport PR #92 to fix tests with parted 3.5 (#2098792)
110+
111+
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:3.12.0-3
112+
- Rebuilt for Python 3.11
113+
114+
* Mon Mar 07 2022 David Cantrell <dcantrell@redhat.com> - 3.12.0-2
115+
- BR python3-setuptools
116+
117+
* Mon Mar 07 2022 David Cantrell <dcantrell@redhat.com> - 3.12.0-1
118+
- Upgrade to pyparted-3.12.0
119+
120+
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.11.7-5
121+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
122+
123+
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.11.7-4
124+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
125+
126+
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1:3.11.7-3
127+
- Rebuilt for Python 3.10
128+
129+
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.11.7-2
130+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
131+
132+
* Fri Oct 23 2020 David Cantrell <dcantrell@redhat.com> - 1:3.11.7-1
133+
- Upgrade to pyparted-3.11.7 (BZ#1890443)
134+
- Set PY_SSIZE_T_CLEAN for the build (bcl)
135+
- add nvme support
136+
- Update RELEASE file to make last step be "make pypi" (dcantrell)
137+
138+
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1:3.11.5-3
139+
- Use make macros
140+
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
141+
142+
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.11.5-2
143+
- Rebuilt for Python 3.9
133144

134-
* Mon Mar 01 2021 Henry Li <lihl@microsoft.com> - 1:3.11.4-2
135-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
136-
- Disable python2 build and enable python3 build only
145+
* Mon Mar 09 2020 David Cantrell <dcantrell@redhat.com> - 1:3.11.5-1
146+
- Require at least libparted 3.3 and python 3.7 (dcantrell)
147+
- pedmodule.c: Fix partition enum flag handling (bcl)
148+
- Add support for chromeos_kernel and bls_boot partition flags (bcl)
149+
- Move exception declarations to _pedmodule.c (dcantrell)
137150

138151
* Tue Feb 11 2020 David Cantrell <dcantrell@redhat.com> - 1:3.11.4-1
139152
- Use Decimal for Device.getSize() operations, return a
1.41 KB
Binary file not shown.

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21883,8 +21883,8 @@
2188321883
"type": "other",
2188421884
"other": {
2188521885
"name": "pyparted",
21886-
"version": "3.11.4",
21887-
"downloadUrl": "https://github.com/dcantrell/pyparted/releases/download/v3.11.4/pyparted-3.11.4.tar.gz"
21886+
"version": "3.13.0",
21887+
"downloadUrl": "https://github.com/dcantrell/pyparted/releases/download/v3.13.0/pyparted-3.13.0.tar.gz"
2188821888
}
2188921889
}
2189021890
},

0 commit comments

Comments
 (0)