[virt-tools-list] [virt-manager PATCH 2/5] One more vnc->spice cleanup

[Cole Robinson]

On 06/18/2013 10:12 AM, Martin Kletzander wrote:
> Last commit changing the default was de1695b2, but there was still one
> place in man page left and the spec file was left dirty.  This is
> hopefully the last vnc->spice patch
> 
> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
> ---
>  man/virt-install.pod | 2 +-
>  virt-manager.spec.in | 6 +++++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/man/virt-install.pod b/man/virt-install.pod
> index f7b8cf6..b4303b2 100644
> --- a/man/virt-install.pod
> +++ b/man/virt-install.pod
> @@ -640,7 +640,7 @@ This parameter is deprecated in favour of C<--network NETWORK,mac=12:34...>
>  =head2 Graphics Configuration
> 
>  If no graphics option is specified, C<virt-install> will default to
> -'--graphics vnc' if the DISPLAY environment variable is set, otherwise
> +'--graphics spice' if the DISPLAY environment variable is set, otherwise
>  '--graphics none' is used.
> 
>  =over 2
> diff --git a/virt-manager.spec.in b/virt-manager.spec.in
> index f3dbe9d..5c0a5b9 100644
> --- a/virt-manager.spec.in
> +++ b/virt-manager.spec.in
> @@ -8,6 +8,7 @@
>  %define libvirt_packages           "libvirt-daemon-kvm,libvirt-daemon-config-network"
>  %define preferred_distros          "fedora,rhel"
>  %define kvm_packages               "qemu-system-x86"
> +%define default_graphics           "spice"
> 
>  %if 0%{?rhel}
>  %define preferred_distros          "rhel,fedora"
> @@ -128,9 +129,12 @@ machine).
>  %define _disable_unsupported_rhel --hide-unsupported-rhel-options
>  %endif
> 
> +%if %{default_graphics}
> +%define _default_graphics --default-graphics=%{default_graphics}
> +%endif
> +
>  python setup.py configure \
>      --pkgversion="%{version}" \
> -    --default-graphics="spice" \
>      %{?_qemu_user} \
>      %{?_kvm_packages} \
>      %{?_libvirt_packages} \
> 

Actually this config option only affects graphics default for virt-manager.
virt-install default still needs to be changed but it should probably be
dependent on OS setting.

So ACK with the first hunk dropped, please push.