From 8bc18a6342812e254a8ae27b924d86d56453dc30 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 5 Dec 2012 08:17:54 -0500 Subject: [PATCH] Upgrade to pyparted-3.9 --- .gitignore | 1 + ...new-disk-flag-PED_DISK_GPT_PMBR_BOOT.patch | 53 ------------------- pyparted.spec | 14 ++--- sources | 2 +- 4 files changed, 9 insertions(+), 61 deletions(-) delete mode 100644 0001-Add-support-for-new-disk-flag-PED_DISK_GPT_PMBR_BOOT.patch diff --git a/.gitignore b/.gitignore index 9b549a9..7820ba7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ pyparted-3.8.tar.gz +/pyparted-3.9.tar.gz diff --git a/0001-Add-support-for-new-disk-flag-PED_DISK_GPT_PMBR_BOOT.patch b/0001-Add-support-for-new-disk-flag-PED_DISK_GPT_PMBR_BOOT.patch deleted file mode 100644 index 62f968d..0000000 --- a/0001-Add-support-for-new-disk-flag-PED_DISK_GPT_PMBR_BOOT.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f017d3197bd063af62cc7f380edbd8fa0a70705a Mon Sep 17 00:00:00 2001 -From: "Brian C. Lane" -Date: Tue, 31 Jan 2012 13:26:28 -0800 -Subject: [PATCH] Add support for new disk flag PED_DISK_GPT_PMBR_BOOT - -parted can now set the boot flag on the GPT PMBR parition. Add support -for this new disk flag. ---- - src/_pedmodule.c | 1 + - src/parted/__init__.py | 1 + - tests/test__ped_disk.py | 2 +- - 3 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/src/_pedmodule.c b/src/_pedmodule.c -index 8604556..ab38b1c 100644 ---- a/src/_pedmodule.c -+++ b/src/_pedmodule.c -@@ -512,6 +512,7 @@ PyMODINIT_FUNC init_ped(void) { - PyModule_AddIntConstant(m, "PARTITION_LEGACY_BOOT", PED_PARTITION_LEGACY_BOOT); - - PyModule_AddIntConstant(m, "DISK_CYLINDER_ALIGNMENT", PED_DISK_CYLINDER_ALIGNMENT); -+ PyModule_AddIntConstant(m, "DISK_GPT_PMBR_BOOT", PED_DISK_GPT_PMBR_BOOT); - - PyModule_AddIntConstant(m, "DISK_TYPE_EXTENDED", PED_DISK_TYPE_EXTENDED); - PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_NAME", PED_DISK_TYPE_PARTITION_NAME); -diff --git a/src/parted/__init__.py b/src/parted/__init__.py -index 5ca37e8..9fcd63d 100644 ---- a/src/parted/__init__.py -+++ b/src/parted/__init__.py -@@ -117,6 +117,7 @@ from _ped import PARTITION_DIAG - from _ped import PARTITION_LEGACY_BOOT - - from _ped import DISK_CYLINDER_ALIGNMENT -+from _ped import DISK_GPT_PMBR_BOOT - - from _ped import DISK_TYPE_EXTENDED - from _ped import DISK_TYPE_PARTITION_NAME -diff --git a/tests/test__ped_disk.py b/tests/test__ped_disk.py -index df92d51..cdd59d4 100755 ---- a/tests/test__ped_disk.py -+++ b/tests/test__ped_disk.py -@@ -143,7 +143,7 @@ class DiskIsFlagAvailableTestCase(RequiresDisk): - # We don't know which flags should be available and which shouldn't, - # but we can at least check that there aren't any tracebacks from - # trying all of the valid ones. -- for flag in [_ped.DISK_CYLINDER_ALIGNMENT]: -+ for flag in [_ped.DISK_CYLINDER_ALIGNMENT, _ped.DISK_GPT_PMBR_BOOT]: - self.assertTrue(isinstance(self._disk.is_flag_available(flag), bool)) - - # However, an invalid flag should definitely not be available. --- -1.7.6.5 - diff --git a/pyparted.spec b/pyparted.spec index 651667a..97004b0 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -1,18 +1,16 @@ Summary: Python module for GNU parted Name: pyparted -Version: 3.8 -Release: 5%{?dist} +Version: 3.9 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://fedorahosted.org/pyparted Source0: http://fedorahosted.org/releases/p/y/%{name}/%{name}-%{version}.tar.gz -Patch1: 0001-Add-support-for-new-disk-flag-PED_DISK_GPT_PMBR_BOOT.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n) BuildRequires: python-devel -BuildRequires: parted-devel >= 3.0-6 +BuildRequires: parted-devel >= 3.1 BuildRequires: pkgconfig %description @@ -21,7 +19,6 @@ partition tables. %prep %setup -q -%patch1 -p1 %build make %{?_smp_mflags} @@ -41,10 +38,13 @@ rm -rf %{buildroot} %{python_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Wed Dec 05 2012 David Cantrell - 3.9-1 +- Upgrade to pyparted-3.9 + * Sat Jul 21 2012 Fedora Release Engineering - 3.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Tue Mar 13 2012 Brian C. Lane 3.8-4 +* Tue Mar 13 2012 Brian C. Lane - 3.8-4 - Rebuild against parted 3.1 * Thu Feb 02 2012 Brian C. Lane - 3.8-3 diff --git a/sources b/sources index bb03c19..35c66c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9cd0c94c71ac17755f71a8e1561eac2 pyparted-3.8.tar.gz +f16c7ef7f5fa4a43fcb2a4654b487e39 pyparted-3.9.tar.gz