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 <dcantrell@redhat.com> - 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 <releng@fedoraproject.org> - 1:3.12.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild