rpms/virt-viewer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use macros for all meson options and fix bash completion deps

Browse Source 
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-11-30 11:34:16 +00:00
parent 1cc2a7dd30
commit 8e4cdf5923
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
virt-viewer.spec
View File

@ -10,7 +10,7 @@
Name: virt-viewer
Version: 10.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Virtual Machine Viewer
License: GPLv2+
URL: https://gitlab.com/virt-viewer/virt-viewer
@ -19,6 +19,9 @@ Patch1: 0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch
Patch2: 0001-src-initialize-keymaps-variable.patch
Requires: openssh-clients
# Our bash completion script uses virsh to list domains
Requires: libvirt-client
BuildRequires: gcc
BuildRequires: meson
BuildRequires: pkgconfig(glib-2.0)
@ -50,6 +53,9 @@ the display, and libvirt for looking up VNC/SPICE server details.
%autosetup -p1
%build
%define buildid_opt -Dbuild-id=%{release}
%if !%{with_govirt}
%define ovirt_opt -Dovirt=disabled
%endif
@ -58,7 +64,11 @@ the display, and libvirt for looking up VNC/SPICE server details.
%define spice_opt -Dspice=disabled
%endif
%meson -Dbuild-id=%{release} %{?ovirt_opt} %{?spice_opt}
%if 0%{?rhel} > 0
%define osid_opt -Dos-id=rhel%{?rhel}
%endif
%meson %{buildid_opt} %{?ovirt_opt} %{?spice_opt} %{?osid_opt}
%meson_build
%install
@ -79,6 +89,10 @@ the display, and libvirt for looking up VNC/SPICE server details.
%{_datadir}/bash-completion/completions/virt-viewer
%changelog
* Thu Nov 25 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-6
- Add missing dep on libvirt-clients for bash completion
- Refactor setting build-id opt
* Tue Nov 16 2021 Tom Stellard <tstellar@redhat.com> - 10.0-5
- Backport fix for uninitialized variable