From 524ba61d9bf74719a6a74ed25cce4d12fa9cc6c6 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 3 Apr 2012 10:52:12 +0100 Subject: [PATCH] Move all documentation into a -docs sub-RPM Currently documentation is split between the libvirt RPM and the libvirt-devel RPM. In the client-only build there is no libvirt RPM, so the docs need to live elsewhere. The obvious answer is a dedicated libvirt-docs RPM. For back-compatibility make the libvirt-devel RPM require the libvirt-docs RPM * libvirt.spec.in: Create separate libvirt-docs RPM --- libvirt.spec.in | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 74f8f9a4a9..8fcb90b028 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -537,6 +537,14 @@ Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The main package includes the libvirtd server exporting the virtualization support. +%package docs +Summary: API reference and website documentation +Group: Development/Libraries + +%description docs +Includes the API reference for the libvirt C library, and a complete +copy of the libvirt.org website documentation. + %package client Summary: Client side library and utilities of the libvirt library Group: Development/Libraries @@ -566,14 +574,14 @@ virtualization capabilities of recent versions of Linux (and other OSes). Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries Requires: %{name}-client = %{version}-%{release} +Requires: %{name}-docs = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel %endif %description devel -Includes and documentations for the C library providing an API to use -the virtualization capabilities of recent versions of Linux (and other OSes). +Include header files & development libraries for the libvirt C library. %if %{with_sanlock} %package lock-sanlock @@ -874,6 +882,9 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.uml %endif +mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ + $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} + %clean rm -fr %{buildroot} @@ -1178,6 +1189,20 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %doc docs/*.xml %endif +%files docs +%defattr(-, root, root) +# Website +%dir %{_datadir}/doc/libvirt-docs-%{version} +%dir %{_datadir}/doc/libvirt-docs-%{version}/html +%{_datadir}/doc/libvirt-docs-%{version}/html/* + +# API docs +%dir %{_datadir}/gtk-doc/html/libvirt/ +%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp +%doc %{_datadir}/gtk-doc/html/libvirt/*.html +%doc %{_datadir}/gtk-doc/html/libvirt/*.png +%doc %{_datadir}/gtk-doc/html/libvirt/*.css + %if %{with_sanlock} %files lock-sanlock %defattr(-, root, root) @@ -1250,11 +1275,6 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %dir %{_includedir}/libvirt %{_includedir}/libvirt/*.h %{_libdir}/pkgconfig/libvirt.pc -%dir %{_datadir}/gtk-doc/html/libvirt/ -%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp -%doc %{_datadir}/gtk-doc/html/libvirt/*.html -%doc %{_datadir}/gtk-doc/html/libvirt/*.png -%doc %{_datadir}/gtk-doc/html/libvirt/*.css %dir %{_datadir}/libvirt/api/ %{_datadir}/libvirt/api/libvirt-api.xml -- GitLab