diff --git a/.gitignore b/.gitignore index e2c2922..f0061cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ pyparted-3.9.2.tar.gz /pyparted-3.9.3.tar.gz /pyparted-3.9.4.tar.gz +/pyparted-3.9.5.tar.gz diff --git a/armv7l.patch b/armv7l.patch deleted file mode 100644 index af5da25..0000000 --- a/armv7l.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/parted/__init__.py b/src/parted/__init__.py -index ae7bc4b..eb1bb15 100644 ---- a/src/parted/__init__.py -+++ b/src/parted/__init__.py -@@ -281,7 +281,8 @@ archLabels = {'i386': ['msdos', 'gpt'], - 'ppc64': ['msdos', 'mac', 'amiga', 'gpt'], - 'ppc64le': ['msdos', 'gpt'], - 'x86_64': ['msdos', 'gpt'], -- 'aarch64': ['msdos', 'gpt']} -+ 'aarch64': ['msdos', 'gpt'], -+ 'armv7l': ['msdos', 'gpt']} - - # Adapted from: - # http://stackoverflow.com/questions/922550/how-to-mark-a-global-as-deprecated-in-python -@@ -315,9 +316,9 @@ def Deprecated(mod, deprecated={}): - __archLabels = (('amiga', 'ppc(64)?$'), - ('bsd', 'alpha$'), - ('dasd', 's390x?$'), -- ('gpt', 'i[3-6]86$|x86_64$|ia64$|ppc(64|64le)?$|aarch64$'), -+ ('gpt', 'i[3-6]86$|x86_64$|ia64$|ppc(64|64le)?$|aarch64$|armv7l$'), - ('mac', 'ppc(64)?$'), -- ('msdos', 'i[3-6]86$|x86_64$|s390x?$|alpha$|ia64$|ppc(64|64le)?$|aarch64$'), -+ ('msdos', 'i[3-6]86$|x86_64$|s390x?$|alpha$|ia64$|ppc(64|64le)?$|aarch64$|armv7l$'), - ('sun', 'sparc(64)?$')) - - def getLabels(arch=None): -diff --git a/tests/test_parted_parted.py b/tests/test_parted_parted.py -index b2db935..9f323e3 100755 ---- a/tests/test_parted_parted.py -+++ b/tests/test_parted_parted.py -@@ -61,6 +61,7 @@ class GetLabelsTestCase(unittest.TestCase): - self.assertSetEqual(parted.getLabels('alpha'), {'bsd', 'msdos'}) - self.assertSetEqual(parted.getLabels('ia64'), {'gpt', 'msdos'}) - self.assertSetEqual(parted.getLabels('aarch64'), {'gpt', 'msdos'}) -+ self.assertSetEqual(parted.getLabels('armv7l'), {'gpt', 'msdos'}) - - class GetDeviceTestCase(RequiresDeviceNode): - def runTest(self): diff --git a/pyparted.spec b/pyparted.spec index 668b61b..370f9c8 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -1,14 +1,13 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 -Version: 3.9.4 -Release: 2%{?dist} +Version: 3.9.5 +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: armv7l.patch 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,9 @@ rm -rf %{buildroot} %{python_sitearch}/%{name}-%{version}-*.egg-info %changelog +* Tue Jun 24 2014 David Cantrell - 3.9.5-1 +- Upgrade to pyparted-3.9.5 + * Tue Jun 24 2014 David Cantrell - 3.9.4-2 - Handle building on armv7l hosts diff --git a/sources b/sources index 153e370..001af75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f03e51fd1d3fa8cfbf76583ab0eaa4fe pyparted-3.9.4.tar.gz +9cf098ec38b9fe0af98782671027c5d6 pyparted-3.9.5.tar.gz