diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-16 18:34:16 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-05-02 14:58:39 +0100 |
| commit | 62bd0ed1ded8194a48825c1f3f508ce93d471777 (patch) | |
| tree | 5a09cd1a48b2ed3dab4a9eefe2696328cb6f6aab | |
| parent | ad4eda18f605c0c82b2e0bc97b9353735d8131ef (diff) | |
| download | dbus-submit/tizen/20130517.020819.tar.gz dbus-submit/tizen/20130517.020819.tar.bz2 dbus-submit/tizen/20130517.020819.zip | |
Adapt for rebase onto upstream dbus-1.6.8 git tagsubmit/tizen/20130517.020819submit/tizen/20130509.173741submit/tizen/20130503.190851submit/tizen/20130503.184738accepted/tizen/20130520.095225accepted/tizen/20130503.223708devel
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
| -rw-r--r-- | packaging/dbus-x11.spec | 2 | ||||
| -rw-r--r-- | packaging/dbus.spec | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/packaging/dbus-x11.spec b/packaging/dbus-x11.spec index a91ac12a..3cba88d0 100644 --- 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 108e1e1f..73760ceb 100644 --- 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 |