Re: [libvirt] [PATCH] spec: fix libvirt-docs subpackage on RHEL

2013-11-20 Thread Daniel P. Berrange
On Wed, Nov 13, 2013 at 12:02:08PM +1100, Michael Chapman wrote: RHEL's rpmbuild wipes the docdir for a (sub-)package if any %doc directives are present, prior to copying in the marked documentation. This means we can't prepopulate this directory with the HTML documentation during the %install

Re: [libvirt] [PATCH] spec: fix libvirt-docs subpackage on RHEL

2013-11-19 Thread Daniel P. Berrange
On Tue, Nov 19, 2013 at 01:03:05PM +1100, Michael Chapman wrote: On Wed, 13 Nov 2013, Michael Chapman wrote: error: create archive failed on file /builddir/build/BUILDROOT/libvirt-1.1.4-1.el6.x86_64/usr/share/doc/libvirt-docs-1.1.4/html/32favicon.png: cpio: Bad magic RPM build errors:

Re: [libvirt] [PATCH] spec: fix libvirt-docs subpackage on RHEL

2013-11-18 Thread Michael Chapman
On Wed, 13 Nov 2013, Michael Chapman wrote: error: create archive failed on file /builddir/build/BUILDROOT/libvirt-1.1.4-1.el6.x86_64/usr/share/doc/libvirt-docs-1.1.4/html/32favicon.png: cpio: Bad magic RPM build errors: File listed twice: /usr/share/doc/libvirt-docs-1.1.4 create

Re: [libvirt] [PATCH] spec: fix libvirt-docs subpackage on RHEL

2013-11-13 Thread Daniel P. Berrange
On Wed, Nov 13, 2013 at 12:02:08PM +1100, Michael Chapman wrote: RHEL's rpmbuild wipes the docdir for a (sub-)package if any %doc directives are present, prior to copying in the marked documentation. This means we can't prepopulate this directory with the HTML documentation during the %install

Re: [libvirt] [PATCH] spec: fix libvirt-docs subpackage on RHEL

2013-11-13 Thread Michael Chapman
On Wed, 13 Nov 2013, Daniel P. Berrange wrote: On Wed, Nov 13, 2013 at 12:02:08PM +1100, Michael Chapman wrote: RHEL's rpmbuild wipes the docdir for a (sub-)package if any %doc directives are present, prior to copying in the marked documentation. This means we can't prepopulate this directory

[libvirt] [PATCH] spec: fix libvirt-docs subpackage on RHEL

2013-11-12 Thread Michael Chapman
RHEL's rpmbuild wipes the docdir for a (sub-)package if any %doc directives are present, prior to copying in the marked documentation. This means we can't prepopulate this directory with the HTML documentation during the %install phase. Instead, move the HTML documentation to a temporary