From 0a5f392ac94f3c25b58c553c3213ec5e3d39920b Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrell@redhat.com>
Date: Mon, 9 Sep 2013 14:02:47 -0400
Subject: [PATCH] Upgrade to pyparted-3.9.2

- Enable 'make check' in the spec file, patch for koji use
- Add armv7l to the list of acceptable arches for gpt and msdos disklabels
---
 .gitignore    |  5 +----
 patch0        | 54 ---------------------------------------------------
 pyparted.spec |  9 ++++++---
 sources       |  2 +-
 4 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 patch0

diff --git a/.gitignore b/.gitignore
index ca7838f..46fb512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1 @@
-pyparted-3.8.tar.gz
-/pyparted-3.9.tar.gz
-/pyparted-3.10.tar.gz
-/pyparted-3.9.1.tar.gz
+pyparted-3.9.2.tar.gz
diff --git a/patch0 b/patch0
deleted file mode 100644
index b58be3f..0000000
--- a/patch0
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -up pyparted-3.9.1/src/parted/__init__.py.orig pyparted-3.9.1/src/parted/__init__.py
---- pyparted-3.9.1/src/parted/__init__.py.orig	2013-09-03 11:27:51.000000000 -0400
-+++ pyparted-3.9.1/src/parted/__init__.py	2013-09-09 13:38:22.525766774 -0400
-@@ -313,9 +313,9 @@ def Deprecated(mod, deprecated={}):
- __archLabels = (('amiga', 'ppc(64)?$'),
-                 ('bsd', 'alpha$'),
-                 ('dasd', 's390x?$'),
--                ('gpt', 'i[3-6]86$|x86_64$|ia64$|ppc(64)?$'),
-+                ('gpt', 'i[3-6]86$|x86_64$|ia64$|ppc(64)?$|armv7l$'),
-                 ('mac', 'ppc(64)?$'),
--                ('msdos', 'i[3-6]86$|x86_64$|s390x?$|alpha$|ia64$|ppc(64)?$'),
-+                ('msdos', 'i[3-6]86$|x86_64$|s390x?$|alpha$|ia64$|ppc(64)?$|armv7l$'),
-                 ('sun', 'sparc(64)?$'))
- 
- def getLabels(arch=None):
-diff -up pyparted-3.9.1/tests/test_parted_parted.py.orig pyparted-3.9.1/tests/test_parted_parted.py
---- pyparted-3.9.1/tests/test_parted_parted.py.orig	2013-09-03 11:27:51.000000000 -0400
-+++ pyparted-3.9.1/tests/test_parted_parted.py	2013-09-09 13:38:00.338766774 -0400
-@@ -59,6 +59,7 @@ class GetLabelsTestCase(unittest.TestCas
-         self.assertSetEqual(parted.getLabels('ppc64'), {'amiga', 'gpt', 'mac', 'msdos'})
-         self.assertSetEqual(parted.getLabels('alpha'), {'bsd', 'msdos'})
-         self.assertSetEqual(parted.getLabels('ia64'), {'gpt', 'msdos'})
-+        self.assertSetEqual(parted.getLabels('armv7l'), {'gpt', 'msdos'})
- 
- class GetDeviceTestCase(RequiresDeviceNode):
-     def runTest(self):
-diff -up pyparted-3.9.1/tests/test__ped_ped.py.orig pyparted-3.9.1/tests/test__ped_ped.py
---- pyparted-3.9.1/tests/test__ped_ped.py.orig	2013-09-03 11:27:51.000000000 -0400
-+++ pyparted-3.9.1/tests/test__ped_ped.py	2013-09-09 13:29:51.028766774 -0400
-@@ -203,14 +203,18 @@ class DeviceGetNextTestCase(unittest.Tes
-         _ped.device_probe_all()
-         lst = self.getDeviceList(_ped.device_get_next)
- 
--        # Now the test cases.
--        self.assertGreater(len(lst), 0)
--        self.assertRaises(TypeError, _ped.device_get_next, None)
-+        # Now the test cases.  This only works if we get any devices back,
-+        # which may not be possible depending on what is executing the test
-+        # cases.  Automated build systems may not provide this functionality,
-+        # so just skip the tests that do not matter when there are no
-+        # devices returned.
-+        if len(lst) > 0:
-+            self.assertRaises(TypeError, _ped.device_get_next, None)
- 
--        for ele in lst:
--            self.assertTrue(isinstance(ele, _ped.Device))
-+            for ele in lst:
-+                self.assertTrue(isinstance(ele, _ped.Device))
- 
--        self.assertRaises(IndexError, _ped.device_get_next, lst[-1])
-+            self.assertRaises(IndexError, _ped.device_get_next, lst[-1])
- 
- class DeviceProbeAllTestCase(RequiresDevice, BuildList):
-     def runTest(self):
diff --git a/pyparted.spec b/pyparted.spec
index bb6dc07..8c9b65b 100644
--- a/pyparted.spec
+++ b/pyparted.spec
@@ -1,14 +1,13 @@
 Summary: Python module for GNU parted
 Name:    pyparted
 Epoch:   1
-Version: 3.9.1
+Version: 3.9.2
 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
-Patch0: patch0
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 BuildRequires: python-devel
@@ -22,7 +21,6 @@ partition tables.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -45,6 +43,11 @@ rm -rf %{buildroot}
 %{python_sitearch}/%{name}-%{version}-*.egg-info
 
 %changelog
+* Mon Sep 09 2013 David Cantrell <dcantrell@redhat.com> - 3.9.2-1
+- Upgrade to pyparted-3.9.2
+- Enable 'make check' in the spec file, patch for koji use
+- Add armv7l to the list of acceptable arches for gpt and msdos disklabels
+
 * Mon Sep 09 2013 David Cantrell <dcantrell@redhat.com> - 3.9.1-1
 - Fix 'make bumpver' to handle multiple decimal points. (dcantrell)
 - Add support for hfs_esp flag (dcantrell)
diff --git a/sources b/sources
index 3c24e7b..4c3a84b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d9b5f07fc8097f33eb6638df62aa41c  pyparted-3.9.1.tar.gz
+d73a7ebe32b0c4f046ded3d6e610dad5  pyparted-3.9.2.tar.gz