Fix-deprecation-warnings-due-to-invalid-escape-seque.patch

@@ -1,39 +0,0 @@
-From e4a898cfea9cc7f8a1f82e93029d40881b4b6739 Mon Sep 17 00:00:00 2001
-From: openEuler Buildteam <buildteam@openeuler.org>
-Date: Fri, 27 Aug 2021 15:50:50 +0800
-Subject: [PATCH] Fix deprecation warnings due to invalid escape sequences
-
----
- dbus/connection.py | 2 +-
- dbus/proxies.py    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dbus/connection.py b/dbus/connection.py
-index f5c8dd9..8895fc9 100644
---- a/dbus/connection.py
-+++ b/dbus/connection.py
-@@ -334,7 +334,7 @@ class Connection(_Connection):
-                                   bus_name=None,
-                                   path=None,
-                                   **keywords):
--        """Arrange for the given function to be called when a signal matching
-+        r"""Arrange for the given function to be called when a signal matching
-         the parameters is received.
- 
-         :Parameters:
-diff --git a/dbus/proxies.py b/dbus/proxies.py
-index 5852046..9b72542 100644
---- a/dbus/proxies.py
-+++ b/dbus/proxies.py
-@@ -304,7 +304,7 @@ class ProxyObject(object):
-     #        """)
- 
-     def connect_to_signal(self, signal_name, handler_function, dbus_interface=None, **keywords):
--        """Arrange for the given function to be called when the given signal
-+        r"""Arrange for the given function to be called when the given signal
-         is received.
- 
-         :Parameters:
--- 
-1.8.3.1
-

dbus-python-1.2.16.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAl4djeUACgkQ4FrhR4+B
+TE8O7Q/+LLFCRTgSKyQAAL/s4lHKrYdvA+SKBOC4AcJQskMgDCuUQJ8pNdpxKCM4
+rt2Y6Vu5f536LBBa5LhgSXxz2ylHp1QS8ch4xXOKCF84cgNPjo6HF2eZ8ekDUJuC
+wgcR+i9uNgUWa058ub9ksQUH9vYJvrmCXj0gN179rmBkrS9hmWy/k7doWQkzd4qZ
+fl7o+25U2oxpvAyF2OsaTtgki77RxggOx609iTi0lNF0ouGcYGyWDO2VcW7bACQx
+fAxcoIvhNBQxmzrYpGT9sne1SiZnYZb0dY8DcndHsUYdrO6Uqizx3BKYhhXGBV7n
+nIKXQN7zLPvPPV9o6SPUkCB+bjbJMGxs0JJv/C03DftjOPT3dxly9IxtrEdIVp4n
+S1gCeN2IvjM7B6BTsVEC7VRdSPhdeQlRXeuejvXb9kKSjuTy9cusJ2t9Li8gZPgh
+783xAZdvQfaZkI7jl6Ha5GwZOMSF075Upfx3HAIRGODsSmVy9xqYYolqLzM3qxvE
+ejuEeDGE9Yh/Hqcs5mq9A7i+z/L3HQXeLdUn8fBmJ77srBZzTqE/ktT5xT7X/9S4
+X9umFn++Oujjw2XWbUhJ5bH1tVvEpKtRHU73GT72Ueo7TBbzej8ST15PCsSbRpwk
+tC1Govkki92VQgMHJQDGwYDS+2VJsYANEZS4tcT/ucH6TCITPbU=
+=xD/3
+-----END PGP SIGNATURE-----

dbus-python-1.2.18.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAmD2m9QACgkQ4FrhR4+B
-TE+OYg/+KbSBEGZtRgcMAsU2SOn88m1Uf3aXm41s7Vg8gMOd3zwQ8emVQP7EbcVu
-6l+RddGVEWltucdoPsppzTnaNgcWDt9+0KNLzBiqROGJwi6BLKl+ZsDaQGq0DPT2
-pV1lBXg0bnivak5CHOCkmKcK1dUr3A9RBDR7YCMN/Uv2jCv7Ci7ZE//NMlB0Teax
-Pv9j45KHKZ/LNJLBuZ0AE2JL4LbSrvsZfDacXcRdWzqtZTchCzQ5tccQzgRtBgSC
-NQnBOtew4eVclD7DQ6zPOMElaK81JgtVDcg3tm/KEser1BrHQNi45gmWhfkiHgQN
-6gDEnkWFTx+fo7GNU2/XpG1CQ/MgwAr9Led9tdJl01mw730Did4Y2TB2/4ZXQsSz
-UAvcqxJORU/oafGZtVI5nC1n30Q5M53fr2zGV9Pf0/9pfy8gH0Dm76tE9yjim3FJ
-iMXGV31eQWnnRqvlVD8U6CStVnmz8ZuPADSon65HTZYlplK7oZp8oYZG8R2nEIED
-yvbFqWhSJAqdKz2xpQ6OMzs5OlQe2UTj0XKfZlqKe8DFot2d1oJjMp1cg6rvKqg4
-ZjswqyzKTHLRs7fO/0kB9DgzMIs1KujurI1lzJwPoODefh/mybnU+FBlr6OrSHvS
-/TQ+OdU0PZDsxJCH5+ezh3HW8yuY08Nc08dHkyjh8ENx7MiRhlw=
-=JTFX
------END PGP SIGNATURE-----

dbus-python.spec

@@ -1,20 +1,18 @@
 %global _configure ../configure
-%global python3dir %{_builddir}/python3-%{name}-%{version}-%{release}
 
 Name:		dbus-python
-Version:	1.2.18
-Release:	5
+Version:	1.2.16
+Release:        2
 Summary:	original Python binding for dbus
-License:	MIT and (AFL-2.1 or GPL-2.0-or-later)
+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
-Patch0: 	Move-python-modules-to-architecture-specific-directo.patch
-Patch1: 	Fix-deprecation-warnings-due-to-invalid-escape-seque.patch
+Patch0: 	0001-Move-python-modules-to-architecture-specific-directo.patch
 
 BuildRequires: dbus-devel dbus-glib-devel glib2-devel
 BuildRequires: dbus-x11 python3-gobject
-BuildRequires: autoconf-archive automake libtool
+BuildRequires: autoconf-archive automake libtool gdb
 
 %description
 Dbus-python is the original Python binding for dbus, the reference
@@ -47,26 +45,16 @@ developing applications that use %{name}.
 %build
 autoreconf -vif
 
-install -d %{python3dir}
-cp -a . %{python3dir}
-mv %{python3dir} python3-build
-
-pushd python3-build
-%py3_build
-%configure PYTHON="%{__python3}"
-%make_build
-popd
+mkdir -p python3-build
+pushd python3-build; %configure PYTHON="%{__python3}"
+%make_build; popd
 
 %install
-pushd python3-build
-%py3_install
-%make_install
-popd
-
-%delete_la
+%make_install -C python3-build
+find %{buildroot} -name '*.la' -delete
 
 %check
-make check -k -C python3-build || (cat python3-build/test-suite.log && true)
+make check -k -C python3-build
 
 %pre
 
@@ -81,7 +69,6 @@ make check -k -C python3-build || (cat python3-build/test-suite.log && true)
 %{python3_sitearch}/_dbus_bindings.so
 %{python3_sitearch}/_dbus_glib_bindings.so
 %{python3_sitearch}/dbus/
-%{python3_sitearch}/dbus_python-%{version}-py%{python3_version}.egg-info
 
 %files devel
 %{_includedir}/dbus-1.0/dbus/%{name}.h
@@ -91,22 +78,6 @@ make check -k -C python3-build || (cat python3-build/test-suite.log && true)
 %doc NEWS ChangeLog README doc/API_CHANGES.txt doc/tutorial.txt
 
 %changelog
-* Mon Jun 19 2023 hongjinghao <hongjinghao@huawei.com> - 1.2.18-5
-- Standardize the patch name
-
-* Wed Jan 11 2023 hongjinghao <hongjinghao@huawei.com> - 1.2.18-4
-- correct licenses and provide pythonXdist
-
-* Tue Oct 25 2022 zhangruifang <zhangruifang1@h-partners.com> - 1.2.18-3
-- Rebuild for next release
-
-* Fri Aug 27 2021 panxiaohe <panxiaohe@huawei.com> - 1.2.18-2
-- Fix deprecation warnings due to invalid escape sequences
-
-* Fri Jul 30 2021 panxiaohe <panxiaohe@huawei.com> - 1.2.18-1
-- update to 1.2.18
-- remove unnecessary BuildRequires: gdb
-
 * Thu Oct 29 2020 panxiaohe <panxiaohe@huawei.com> - 1.2.16-2
 - Type:requirement
 - ID:NA