- calling epydoc via python interpreter mixes py2 and py3 imports, disable it

- rel 6

diff --git a/epidoc.patch b/epidoc.patch
new file mode 100644 (file)
index 0000000..d617bfa
--- /dev/null
+++ b/epidoc.patch
@@ -0,0 +1,10 @@
+--- dbus-python-1.2.0/Makefile.am~     2012-10-16 18:38:42.000000000 +0200
++++ dbus-python-1.2.0/Makefile.am      2015-03-11 00:52:36.661397300 +0100
+@@ -137,7 +137,6 @@
+       mkdir api
+       cd $(abs_top_srcdir) && \
+       PYTHONPATH=$(APIDOC_PYTHONPATH) DBUS_PYTHON_NO_DEPRECATED=1 \
+-      $(PYTHON) -Wignore::DeprecationWarning \
+       $(EPYDOC) -o $(abs_top_builddir)/api --html \
+               --docformat restructuredtext -v \
+               `find dbus -name '*.py' \

diff --git a/python-dbus.spec b/python-dbus.spec
index 8e2ade4257b49f23db7cd90b3cc7204476e2802e..f259c0b4947c3fd15b015fec7c6aedb191a6a692 100644 (file)
--- a/python-dbus.spec
+++ b/python-dbus.spec
@@ -9,11 +9,12 @@ Summary:      Python library for using D-BUS
 Summary(pl.UTF-8):     Biblioteka do używania D-BUS oparta o Pythona
 Name:          python-dbus
 Version:       1.2.0
-Release:       5
+Release:       6
 License:       MIT
 Group:         Libraries/Python
 Source0:       http://dbus.freedesktop.org/releases/dbus-python/%{rname}-%{version}.tar.gz
 # Source0-md5: b09cd2d1a057cc432ce944de3fc06bf7
+Patch0:                epidoc.patch
 URL:           http://www.freedesktop.org/Software/DBusBindings
 BuildRequires: autoconf >= 2.59c
 BuildRequires: automake >= 1:1.9
@@ -72,8 +73,13 @@ z Pythonem 3.
 
 %prep
 %setup -qn %{rname}-%{version}
+%patch0 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+
 %if %{with python3}
 mkdir py3
 cd py3
@@ -118,9 +124,6 @@ rm -rf $RPM_BUILD_ROOT
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
 
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/dbus/*.py[co]
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/dbus/mainloop/*.py[co]
-
 %{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/_dbus*.la
 %endif