[dbus/f20] Add some more documentation from the upstream tarball

David King amigadave at fedoraproject.org
Sun Dec 14 19:56:32 UTC 2014


commit 075b666441116ea9fdfe4e5fb2f2f30083c77448
Author: David King <amigadave at amigadave.com>
Date:   Wed Dec 3 15:28:37 2014 +0000

    Add some more documentation from the upstream tarball
    
    Add a symlink to make sure that the reference documentation shows up in
    Devhelp.

 dbus.spec |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/dbus.spec b/dbus.spec
index 8dfd916..e0da4d2 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -157,6 +157,10 @@ mkdir -p %{buildroot}/var/lib/dbus
 install -pm 644 -t %{buildroot}%{_pkgdocdir} \
     doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt
 
+# Make sure that the documentation shows up in Devhelp.
+mkdir -p %{buildroot}%{_datadir}/gtk-doc/html
+ln -s %{_pkgdocdir} %{buildroot}%{_datadir}/gtk-doc/html/dbus
+
 %check
 if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf -v -f -i; fi
 %configure %{dbus_common_config_opts} --enable-asserts --enable-verbose-mode --enable-tests --enable-developer \
@@ -201,12 +205,16 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 # Strictly speaking, we could remove the COPYING from this subpackage and 
-# just have it be in libs, because dbus Requires dbus-libs
-# However, since it lived here before, I left it in place.
-# Maintainer, feel free to remove it from here if you wish.
+# just have it be in libs, because dbus Requires dbus-libs.
 %{!?_licensedir:%global license %%doc}
 %license COPYING
-%dir %{_pkgdocdir}
+%doc AUTHORS ChangeLog HACKING NEWS README
+%exclude %{_pkgdocdir}/api
+%exclude %{_pkgdocdir}/dbus.devhelp
+%exclude %{_pkgdocdir}/diagram.*
+%exclude %{_pkgdocdir}/introspect.*
+%exclude %{_pkgdocdir}/system-activation.txt
+%exclude %{_pkgdocdir}/*.html
 %dir %{_sysconfdir}/dbus-1
 %config %{_sysconfdir}/dbus-1/*.conf
 %dir %{_sysconfdir}/dbus-1/system.d
@@ -254,6 +262,12 @@ rm -rf %{buildroot}
 %files doc
 %defattr(-,root,root)
 %{_pkgdocdir}/*
+%{_datadir}/gtk-doc
+%exclude %{_pkgdocdir}/AUTHORS
+%exclude %{_pkgdocdir}/ChangeLog
+%exclude %{_pkgdocdir}/HACKING
+%exclude %{_pkgdocdir}/NEWS
+%exclude %{_pkgdocdir}/README
 
 %files devel
 %defattr(-,root,root)
@@ -266,6 +280,7 @@ rm -rf %{buildroot}
 
 %changelog
 * Wed Dec 03 2014 David King <amigadave at amigadave.com> - 1:1.6.28-2
+- Add some more documentation from the upstream tarball
 - Use macroized systemd scriptlets (#850083)
 - Correct license description for multiple licenses
 - fix license handling


More information about the scm-commits mailing list