rpms/dbus-python
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix patch

Browse Source
This commit is contained in:
leigh123linux 2016-02-23 07:34:06 +00:00
parent 06439e6875
commit 276b0e2757
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
0001-Move-python-modules-to-architecture-specific-directo.patch
View File

@ -1,6 +1,6 @@
From 4953f89845a55bddd21df1b505301b884ab2809a Mon Sep 17 00:00:00 2001 From 380ae714f641a73a30f86ae8f5a2e05ac063b37f Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org> From: leigh123linux <leigh123linux@googlemail.com>
Date: Tue, 18 Mar 2014 16:04:23 -0400 Date: Tue, 23 Feb 2016 07:32:08 +0000
Subject: [PATCH] Move python modules to architecture-specific directory Subject: [PATCH] Move python modules to architecture-specific directory
This is because dbus-python gets dragged in as a dependency of other This is because dbus-python gets dragged in as a dependency of other
@ -11,10 +11,10 @@ modules conflict.
1 file changed, 5 insertions(+), 4 deletions(-) 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index ebc2e43..1a14da4 100644 index 3a821fa..dcf4320 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -17,7 +17,8 @@ EXTRA_DIST = \ @@ -146,7 +146,8 @@ dbus_py_test_la_SOURCES = \
# === dbus package === # === dbus package ===
@ -24,7 +24,7 @@ index ebc2e43..1a14da4 100644
dbus/bus.py \ dbus/bus.py \
dbus/connection.py \ dbus/connection.py \
dbus/_compat.py \ dbus/_compat.py \
@@ -38,12 +39,12 @@ nobase_python_PYTHON = \ @@ -167,12 +168,12 @@ nobase_python_PYTHON = \
dbus/types.py dbus/types.py
if !HAVE_PYTHON_3 if !HAVE_PYTHON_3
@ -39,15 +39,15 @@ index ebc2e43..1a14da4 100644
include $(top_srcdir)/tools/check-coding-style.mk include $(top_srcdir)/tools/check-coding-style.mk
# === Devel stuff === # === Devel stuff ===
@@ -130,7 +131,7 @@ _dbus_glib_bindings/_dbus_glib_bindings.la: @@ -415,7 +416,7 @@ clean-local:
APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/.libs
-api api/index.html: $(nobase_python_PYTHON) \ -api api/index.html: $(nobase_python_PYTHON) \
+api api/index.html: $(nobase_dbuspy_DATA) \ +api api/index.html: $(nobase_dbuspy_DATA) \
_dbus_bindings/_dbus_bindings.la \ _dbus_bindings.la \
_dbus_glib_bindings/_dbus_glib_bindings.la _dbus_glib_bindings.la
rm -rf api rm -rf api
-- --
1.8.3.1 2.5.0