[libvirt] [PATCH] libvirt.spec: remove duplicate files from -docs package
Michal Privoznik
mprivozn at redhat.com
Wed May 4 09:42:28 UTC 2016
On 04.05.2016 11:14, Daniel P. Berrange wrote:
> Previous commit moved some lists out of the -devel package
> and into the -docs package
>
> commit feffcc03a0d3690dcffd860682dcbaa61d726b39
> Author: Cole Robinson <crobinso at redhat.com>
> Date: Wed Apr 13 10:37:42 2016 -0400
>
> spec: Only pull in API docs with -devel package
>
> What was not realized is that the rule 'libvirt-docs/*'
> and ' docs/*.html docs/html docs/*.gif' actually point
> to the exact same content. ie, we had previously included
> the website HTML in *both* the -docs and -devel packages.
>
> So this change ended up listing the files twice, which
> caused RPM to print a load of warnings:
>
> warning: File listed twice: /usr/share/doc/libvirt-docs/html
> warning: File listed twice: /usr/share/doc/libvirt-docs/html/32favicon.png
> warning: File listed twice: /usr/share/doc/libvirt-docs/html/404.html
> warning: File listed twice: /usr/share/doc/libvirt-docs/html/acl.html
> warning: File listed twice: /usr/share/doc/libvirt-docs/html/aclpolkit.html
>
> Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
> ---
> libvirt.spec.in | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index f441c51..a24be32 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -1956,7 +1956,6 @@ exit 0
> %defattr(-, root, root)
> %doc AUTHORS ChangeLog.gz NEWS README TODO
> %doc libvirt-docs/*
> -%doc docs/*.html docs/html docs/*.gif
>
> # API docs
> %dir %{_datadir}/gtk-doc/html/libvirt/
>
ACK
I've noticed the rpm build failure, but got sidetracked.
Michal
More information about the libvir-list
mailing list