Compare commits

..

No commits in common. "e4f4b8944affd35b78944414279c84bbc792461a" and "730db1d627f4b496e54e467a9610906f03cd7cab" have entirely different histories.

7 changed files with 47 additions and 111 deletions

View File

@ -1,4 +1,4 @@
From 86741aa93aaaf388899d1fa0c25d0d67729b7a5c Mon Sep 17 00:00:00 2001
From 380ae714f641a73a30f86ae8f5a2e05ac063b37f Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Tue, 23 Feb 2016 07:32:08 +0000
Subject: [PATCH] Move python modules to architecture-specific directory
@ -7,14 +7,14 @@ This is because dbus-python gets dragged in as a dependency of other
things people want to be multilib-compatible. As is the Python
modules conflict.
---
Makefile.am | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
Makefile.am | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 8738d57..b6d30c0 100644
index fd480d4..0859994 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -176,7 +176,8 @@ test_dbus_py_test_la_SOURCES = \
@@ -155,7 +155,8 @@ test_dbus_py_test_la_SOURCES = \
# === dbus package ===
@ -24,24 +24,29 @@ index 8738d57..b6d30c0 100644
dbus/bus.py \
dbus/connection.py \
dbus/_compat.py \
@@ -195,7 +196,7 @@ nobase_python_PYTHON = \
dbus/service.py \
@@ -175,12 +176,12 @@ nobase_python_PYTHON = \
dbus/types.py
if !HAVE_PYTHON_3
-nobase_python_PYTHON += \
+nobase_dbuspy_DATA += \
dbus/gobject_service.py \
$(NULL)
endif
-check_py_sources = $(nobase_python_PYTHON)
+check_py_sources = $(nobase_dbuspy_DATA)
include $(top_srcdir)/tools/check-coding-style.mk
# === Devel stuff ===
@@ -434,7 +435,7 @@ uninstall-local-pycache:
@@ -416,7 +417,7 @@ uninstall-local: uninstall-local-sphinx
if ENABLE_DOCUMENTATION
all: doc/html/.stamp
all: doc/_build/.stamp
-doc/html/.stamp: $(nobase_python_PYTHON) \
+doc/html/.stamp: $(nobase_dbuspy_DATA) \
-doc/_build/.stamp: $(nobase_python_PYTHON) \
+doc/_build/.stamp: $(nobase_dbuspy_DATA) \
_dbus_bindings.la \
_dbus_glib_bindings.la \
$(sphinx_sources) \
--
2.37.3
2.17.0

View File

@ -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

BIN
dbus-python-1.2.16.tar.gz Normal file

Binary file not shown.

View File

@ -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-----

Binary file not shown.

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEENuxaZEik9e95vv6Y4FrhR4+BTE8FAmMXr9sACgkQ4FrhR4+B
TE+guQ//SUYy6BjqfaaZIiWcPWDFiX6KRRHQBuzg/hcRXuktAIzvRcNuG7vmgcez
L+DJleH5nsAjf238p052uxqrqnb9TPH4fIeB3E6V/E2GjgNG7sJXNKHc/4XNI1b1
5FXYkHDCUcelH7E4dllllSLUSqXPtnX3nm7JrMXKi6kwaSNvXSQdrsAMWfydbwNU
rMKSrqzrLmtHAYkOTb40Dyy4sUcfKV8ZuDYo5KdYMzpY7/wb8X5e4Teye3CXProm
qh9Mc7Wvdb6cLXrJnXyOHF1CjXwHWG0kuNMm32qkB2KYZZR3KSDOlkjLOabycem3
bUhiKiQlNKlz+C6T9WLb8Hg6no+vLRjD62/sSX/cVgueDoS8nxzRJfwCGepK8kpv
2IwDIfoTeZfsz96E/OiHFzs9fpxEAak2jdlONoFeAPrxRCUZJDH7mPeKfn1dLpN6
orBbCM+QvTX5NJG3xj3OwVU7/5E3uX52LsYZcOvIpjQwXFtL58Fo7m7bCBuUItKr
r0Ono5De52eULI30YWeVMOBuRMGxppKvxNEz3gvxd15EM7L8QxZlqGqgFV+NtOP2
D+kcRtWc8Doc6BPi9PMmHBo65U/mVwJwBMjr9jKsnuRG5RD+Pl46++/PgFV2M3Pq
0ucdoiXjVyhLuWUSV4T3i2OXyC8hqfiXaxgvF/DVCChOSWL7mEY=
=lkWO
-----END PGP SIGNATURE-----

View File

@ -1,20 +1,18 @@
%global _configure ../configure
%global python3dir %{_builddir}/python3-%{name}-%{version}-%{release}
Name: dbus-python
Version: 1.3.2
Release: 1
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: 0001-Move-python-modules-to-architecture-specific-directo.patch
Patch1: Fix-deprecation-warnings-due-to-invalid-escape-seque.patch
BuildRequires: dbus-devel dbus-glib-devel glib2-devel
BuildRequires: dbus-x11 python3-gobject python3-pip python3-wheel
BuildRequires: autoconf-archive automake libtool
BuildRequires: dbus-x11 python3-gobject
BuildRequires: autoconf-archive automake libtool gdb
%description
Dbus-python is the original Python binding for dbus, the reference
@ -47,28 +45,16 @@ developing applications that use %{name}.
%build
autoreconf -vif
export DBUS_PYTHON_USE_AUTOTOOLS=1
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
export DBUS_PYTHON_USE_AUTOTOOLS=1
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
@ -80,9 +66,9 @@ make check -k -C python3-build || (cat python3-build/test-suite.log && true)
%files -n python3-dbus
%license COPYING
%{python3_sitearch}/*.so
%{python3_sitearch}/_dbus_bindings.so
%{python3_sitearch}/_dbus_glib_bindings.so
%{python3_sitearch}/dbus/
%{python3_sitearch}/dbus_python*egg-info
%files devel
%{_includedir}/dbus-1.0/dbus/%{name}.h
@ -92,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 Oct 17 2022 dillon chen <dillon.chen@gmail.com> - 1.3.2-1
- update to 1.3.2
* Mon Dec 06 2021 herengui <herengui@uniontech.com> - 1.2.18-3
- Type:update
- ID:NA
- SUG:NA
- DESC: 1. correct licenses; 2. provides pythonXdist
* 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