On 02/05/2014 02:51 AM, Daniel P. Berrange wrote:
On Tue, Feb 04, 2014 at 03:15:56PM -0700, Eric Blake wrote:
> On Fedora 20, with wireshark-devel installed, 'make rpm' failed
> due to installed but unpackaged files related to wireshark. As
> F20 is already released without wireshark, I chose to add a new
> sub-package that is enabled only for F21 and later. Furthermore,
> all existing wireshark plugins belong to the wireshark package,
> so I got to invent behavior of how the first third-part wireshark
> module will behave.
>
> * libvirt.spec.in (with_wireshark): Add new conditional.
> * configure.ac (ws-plugindir): Improve wording.
>
> Signed-off-by: Eric Blake <eblake(a)redhat.com>
> ---
>
> I was tempted to push this as a build-breaker fix for 'make rpm',
> but rpms are close enough to black magic that I decided a review
> is safer, after all. Tested with both F20 (not built) and F21
> (new subpackage built just fine), using normal build of all
> subpackages and also a build with '%client_only 1' in ~/.rpmmacros
> to ensure that it indeed works in a client-only setup.
>
> configure.ac | 4 ++--
> libvirt.spec.in | 34 ++++++++++++++++++++++++++++++++++
> 2 files changed, 36 insertions(+), 2 deletions(-)
ACK
Thanks; pushed.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org