[packages/python-dbus] - updated to 1.2.8 (now uses glib2 2.40+ instead of dbus-glib) - removed outdated epydoc patch; now
qboosh
qboosh at pld-linux.org
Sat Jun 9 11:41:48 CEST 2018
commit a48c2ccd38c9e3ce4cebcfb9ea6bb3a86b1c57d4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jun 9 11:43:01 2018 +0200
- updated to 1.2.8 (now uses glib2 2.40+ instead of dbus-glib)
- removed outdated epydoc patch; now it uses Sphinx
- package HTML docs in -apidocs package
epydoc.patch | 10 --------
python-dbus.spec | 74 ++++++++++++++++++++++++++++++++++++++++----------------
2 files changed, 53 insertions(+), 31 deletions(-)
---
diff --git a/python-dbus.spec b/python-dbus.spec
index 7774921..fc23792 100644
--- a/python-dbus.spec
+++ b/python-dbus.spec
@@ -1,38 +1,49 @@
#
# Conditional build:
-%bcond_without python2 # Python 2.x module
-%bcond_without python3 # Python 3.x module
+%bcond_without python2 # Python 2.x module
+%bcond_without python3 # Python 3.x module
+%bcond_without apidocs # Sphinx-based API documentation
#
%define rname dbus-python
#
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.4
-Release: 2
+Version: 1.2.8
+Release: 1
License: MIT
Group: Libraries/Python
Source0: https://dbus.freedesktop.org/releases/dbus-python/%{rname}-%{version}.tar.gz
-# Source0-md5: 7372a588c83a7232b4e08159bfd48fe5
-Patch0: epydoc.patch
+# Source0-md5: 7379db774c10904f27e7e2743d90fb43
URL: https://www.freedesktop.org/wiki/Software/DBusBindings
BuildRequires: autoconf >= 2.59c
BuildRequires: autoconf-archive
BuildRequires: automake >= 1:1.13
BuildRequires: cpp
BuildRequires: dbus-devel >= 1.8
-BuildRequires: dbus-glib-devel >= 0.73
-BuildRequires: epydoc >= 3
+BuildRequires: glib2-devel >= 1:2.40
BuildRequires: libtool
BuildRequires: pkgconfig
-%{?with_python2:BuildRequires: python-devel >= 1:2.6}
-%{?with_python3:BuildRequires: python3-devel >= 1:3.2}
+%if %{with python2}
+BuildRequires: python-devel >= 1:2.7
+%if %{with apidocs}
+BuildRequires: python-Sphinx
+BuildRequires: python-sphinx_rtd_theme
+%endif
+%endif
+%if %{with python3}
+BuildRequires: python3-devel >= 1:3.4
+%if %{with apidocs} && %{without python2}
+BuildRequires: python3-Sphinx
+BuildRequires: python3-sphinx_rtd_theme
+%endif
+%endif
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.268
-%pyrequires_eq python-modules
-Requires: dbus-glib >= 0.73
Requires: dbus-libs >= 1.8
+Requires: glib2 >= 1:2.40
Requires: python-libxml2 >= 1:2.6.26
+Requires: python-modules >= 1:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -49,8 +60,9 @@ Summary(pl.UTF-8): API C dla modułu _dbus_bindings
License: AFL v2.1 or LGPL v2.1
Group: Development/Libraries
Requires: dbus-devel >= 1.8
+Requires: glib2-devel >= 1:2.40
#R: python-dbus = %{version}-%{release} or python3-dbus = %{version}-%{release}
-#R: python-devel >= 1:2.5 or python3-devel
+#R: python-devel >= 1:2.7 or python3-devel >= 1:3.4
%description devel
C API for _dbus_bindings module.
@@ -58,12 +70,24 @@ C API for _dbus_bindings module.
%description devel -l pl.UTF-8
API C dla modułu _dbus_bindings.
+%package apidocs
+Summary: API documentation for Python dbus module
+Summary(pl.UTF-8): Dokumentacja API modułu Pythona dbus
+Group: Documentation
+
+%description apidocs
+API documentation for Python dbus module.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API modułu Pythona dbus.
+
%package -n python3-dbus
Summary: Python 3 library for using D-BUS
Summary(pl.UTF-8): Biblioteka do używania D-BUS oparta o Pythona 3
Group: Libraries/Python
-Requires: dbus-glib >= 0.73
Requires: dbus-libs >= 1.8
+Requires: glib2 >= 1:2.40
+Requires: python3-modules >= 1:3.4
%description -n python3-dbus
D-BUS add-on library to integrate the standard D-BUS library with
@@ -75,7 +99,6 @@ z Pythonem 3.
%prep
%setup -qn %{rname}-%{version}
-%patch0 -p1
%build
%{__aclocal}
@@ -87,7 +110,8 @@ mkdir py3
cd py3
../%configure \
PYTHON=%{__python3} \
- PYTHON_LIBS=-lpython3
+ PYTHON_LIBS=-lpython3 \
+ --enable-documentation%{?with_python2:=no}%{!?with_python2:%{!?with_apidocs:=no}}
%{__make}
cd ..
%endif
@@ -97,7 +121,8 @@ mkdir py2
cd py2
../%configure \
PYTHON=%{__python} \
- PYTHON_LIBS=-lpython
+ PYTHON_LIBS=-lpython \
+ --enable-documentation%{!?with_apidocs:=no}
%{__make}
cd ..
%endif
@@ -129,8 +154,9 @@ rm -rf $RPM_BUILD_ROOT
%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/_dbus*.la
%endif
-# packaged as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/dbus-python
+%if %{with apidocs}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/dbus-python/{_sources,objects.inv}
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -138,7 +164,7 @@ rm -rf $RPM_BUILD_ROOT
%if %{with python2}
%files
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README doc/*.txt
+%doc AUTHORS COPYING ChangeLog NEWS README doc/{API_CHANGES,tutorial}.txt
%dir %{py_sitedir}/dbus
%{py_sitedir}/dbus/*.py[co]
%dir %{py_sitedir}/dbus/mainloop
@@ -152,10 +178,16 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/dbus-1.0/dbus/dbus-python.h
%{_pkgconfigdir}/dbus-python.pc
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_docdir}/dbus-python
+%endif
+
%if %{with python3}
%files -n python3-dbus
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README doc/*.txt
+%doc AUTHORS COPYING ChangeLog NEWS README doc/{API_CHANGES,tutorial}.txt
%dir %{py3_sitedir}/dbus
%{py3_sitedir}/dbus/__pycache__
%{py3_sitedir}/dbus/*.py
diff --git a/epydoc.patch b/epydoc.patch
deleted file mode 100644
index d617bfa..0000000
--- a/epydoc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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' \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/python-dbus.git/commitdiff/a48c2ccd38c9e3ce4cebcfb9ea6bb3a86b1c57d4
More information about the pld-cvs-commit
mailing list