[libvirt] [PATCH] rpm: require radvd when building network support

[Daniel P. Berrange]

On Wed, Mar 23, 2011 at 08:49:19AM -0600, Eric Blake wrote:
> Otherwise, if the build machine doesn't have radvd, then the
> configure test won't wire in anything for the radvd executable,
> and attempts to use that rpm for ipv6 will fail even on machines
> where radvd is present.
> 
> error: Failed to start network ipv6net
> error: Cannot find radvd - Possibly the package isn't installed: No such file
> or directory
> 
> Note that this is a build requirement; the runtime requirement
> is still optional, and the above failure is still expected for
> an rpm built with radvd but installed on a non-ipv6 machine.
> 
> * libvirt.spec.in (with_network): Add BuildRequires for radvd.
> ---
>  .gnulib         |    2 +-
>  libvirt.spec.in |    2 ++
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/.gnulib b/.gnulib
> index c2090a8..a01e7c4 160000
> --- a/.gnulib
> +++ b/.gnulib
> @@ -1 +1 @@
> -Subproject commit c2090a84dc3997acada3166772afac94f2d3a25c
> +Subproject commit a01e7c4c58d3c6cad50974367ec60139cc919973

I guess you didn't mean to include this.

> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 4a62c80..1e6b5b5 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -78,6 +78,7 @@
>  %define with_audit         0%{!?_without_audit:0}
>  %define with_dtrace        0%{!?_without_dtrace:0}
>  %define with_cgconfig      0%{!?_without_cgconfig:0}
> +%define with_ipv6          0%{!?_without_ipv6:0}

This hasn't been used.

> 
>  # Non-server/HV driver defaults which are always enabled
>  %define with_python        0%{!?_without_python:1}
> @@ -339,6 +340,7 @@ BuildRequires: libselinux-devel
>  %endif
>  %if %{with_network}
>  BuildRequires: dnsmasq >= 2.41
> +BuildRequires: radvd
>  %endif

We also want to  'Requires: radvd' in the later block,
so that it is actually present at runtime. For that matter,
we're also missing 'Requires: iptables-ipv6'


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|