Update to 1.2.18 (#1985856)

Resolves: #1985856

.gitignore

@@ -10,3 +10,5 @@
 /dbus-python-1.2.8.tar.gz.asc
 /dbus-python-1.2.16.tar.gz
 /dbus-python-1.2.16.tar.gz.asc
+/dbus-python-1.2.18.tar.gz
+/dbus-python-1.2.18.tar.gz.asc

dbus-python.spec

@@ -1,20 +1,22 @@
 Summary: D-Bus Python Bindings
 Name:    dbus-python
-Version: 1.2.16
-Release: 5%{?dist}
+Version: 1.2.18
+Release: 1%{?dist}
 
 License: MIT
 URL:     http://www.freedesktop.org/wiki/Software/DBusBindings/
 Source0: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz
 Source1: http://dbus.freedesktop.org/releases/dbus-python/%{name}-%{version}.tar.gz.asc
+# gpg --keyserver keyring.debian.org --recv-keys 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F
+# gpg --export --export-options export-minimal > gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg
+Source2: gpgkey-36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F.gpg
 
 # borrow centos7 patch to use sitearch properly
 Patch0: 0001-Move-python-modules-to-architecture-specific-directo.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1788491
-Patch1: python39.patch
 
-BuildRequires: dbus-devel
-BuildRequires: glib2-devel
+BuildRequires: gnupg2
+BuildRequires: pkgconfig(dbus-1)
+BuildRequires: pkgconfig(glib-2.0)
 # for %%check
 BuildRequires: dbus-x11
 BuildRequires: python%{python3_pkgversion}-gobject
@@ -45,6 +47,7 @@ Headers and static libraries for hooking up custom mainloops to the dbus python
 bindings.
 
 %prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
 # For new arches (aarch64/ppc64le), and patch0
@@ -80,6 +83,10 @@ make check -k || (cat test-suite.log && false)
 %{_libdir}/pkgconfig/dbus-python.pc
 
 %changelog
+* Mon Jul 26 2021 David King <amigadave@amigadave.com> - 1.2.18-1
+- Update to 1.2.18 (#1985856)
+- Verify GPG signature of sources
+
 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.16-5
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 

python39.patch

@@ -1,12 +0,0 @@
---- a/dbus/service.py
-+++ b/dbus/service.py
-@@ -32,7 +32,7 @@
- import logging
- import threading
- import traceback
--from collections import Sequence
-+from collections.abc import Sequence
- 
- import _dbus_bindings
- from dbus import (
-

sources

@@ -1,2 +1,2 @@
-SHA512 (dbus-python-1.2.16.tar.gz) = e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
-SHA512 (dbus-python-1.2.16.tar.gz.asc) = 1a8355303f86cba326e5380e9a3af38fca10d389b45d30c3a22d66de6ebb3afb5517c58fd00645f40a1c980739bb6cf8cc0e06b06a4e2e8c5e9eea66a71ff590
+SHA512 (dbus-python-1.2.18.tar.gz) = 72f422c59637392bd78b741b66dff2afadcc706452c3e82fdc14b1dc052a0c5cb8a85e2758d18c5cbdc08004419a0b3c16b67b99688d96307084403e72585900
+SHA512 (dbus-python-1.2.18.tar.gz.asc) = 5f8b0c8c1771f4e8ace9168c02f04d0e065cfa8dfdaf7e7d991232e42e0f77bef9d72c565a053ed0cee1ac75b5ab7b929fcdb88d34b21f1489107ea4847ada0a