Adapt for rebase onto upstream dbus-1.6.8 git tag

When building from git we need a BuildRequires on xmlto, since we can
no longer rely on the pre-generated HTML documentation from the tarball.

That pulls in libxslt-tools, which means dbus.devhelp is generated, so
the build fails because we weren't accounting for that; so explicitly
require libxslt-tools too (dbus uses it both via xmlto, and directly),
and package dbus.devhelp.

Change-Id: I7505fc6fd1e7c4fc23a53f349a4fdd18d88237ec

diff --git a/packaging/dbus-x11.spec b/packaging/dbus-x11.spec
index a91ac12..3cba88d 100644 (file)
--- a/packaging/dbus-x11.spec
+++ b/packaging/dbus-x11.spec
@@ -15,11 +15,13 @@ Summary:        D-Bus Message Bus System
 BuildRequires:  doxygen
 BuildRequires:  expat-devel
 BuildRequires:  libtool
+BuildRequires:  libxslt-tools
 BuildRequires:  libzio
 BuildRequires:  pkg-config
 %if %{with_systemd}
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(libsystemd-login)
+BuildRequires:  xmlto
 %endif
 Version:        1.6.8
 Release:        0

diff --git a/packaging/dbus.spec b/packaging/dbus.spec
index 108e1e1..73760ce 100644 (file)
--- a/packaging/dbus.spec
+++ b/packaging/dbus.spec
@@ -14,8 +14,10 @@ Group:          Base/IPC
 BuildRequires:  doxygen
 BuildRequires:  expat-devel
 BuildRequires:  libtool
+BuildRequires:  libxslt-tools
 BuildRequires:  libzio
 BuildRequires:  pkg-config
+BuildRequires:  xmlto
 %if %{with_systemd}
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(libsystemd-login)
@@ -216,6 +218,7 @@ install -m0644 %{SOURCE6} %{buildroot}%{_unitdir_user}/dbus.socket
 %doc %{_datadir}/doc/dbus/dbus-specification.html
 %doc %{_datadir}/doc/dbus/dbus-test-plan.html
 %doc %{_datadir}/doc/dbus/dbus-tutorial.html
+%doc %{_datadir}/doc/dbus/dbus.devhelp
 %doc %{_datadir}/doc/dbus/diagram.*
 %doc %{_datadir}/doc/dbus/system-activation.txt
 %doc doc/*.txt doc/file-boilerplate.c doc/TODO