From ac9cfb912ad5ff53a7004de18e9421a299e00e29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Wed, 21 Apr 2021 10:44:30 +0100
Subject: [PATCH] Update to 10.0 release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves: rhbz#1949526
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 .gitignore       |  2 +-
 sources          |  2 +-
 virt-viewer.spec | 99 ++++++++++++++++--------------------------------
 3 files changed, 35 insertions(+), 68 deletions(-)

diff --git a/.gitignore b/.gitignore
index b903811..a72de3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 *.rpm
 x86_64
 i386
-virt-viewer-*.tar.gz
+virt-viewer-*.tar.xz
diff --git a/sources b/sources
index 18ea4ba..8b2ddb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virt-viewer-9.0.tar.gz) = a5901d76c3e144fa3d6e640de93ed7f1e7cbeb075c04cdbe4a8c9c09bce96104ea552484df5e84c7a69af8dddd1177123ddb81b2dac775a98ac312f3102daae2
+SHA512 (virt-viewer-10.0.tar.xz) = 82ed552337c3d71d762aed14e6fb20a123448fd5cf8c51f8f942ddd226ee2a4fa3ab8b9b893bbdde16628fb03363f2455e1d895074237d40ff567d642d216fd3
diff --git a/virt-viewer.spec b/virt-viewer.spec
index 7f7a3ee..527a099 100644
--- a/virt-viewer.spec
+++ b/virt-viewer.spec
@@ -1,62 +1,42 @@
 # -*- rpm-spec -*-
 
-# Default to skipping autoreconf.  Distros can change just this one line
-# (or provide a command-line override) if they backport any patches that
-# touch configure.ac or Makefile.am.
-%{!?enable_autotools:%global enable_autotools 0}
-
-%define with_spice 0
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6
-%define with_spice 1
-%endif
-
-%define with_govirt 0
-%if 0%{?fedora} > 19 || 0%{?rhel} >= 7
-%define with_govirt 1
+%if 0%{?rhel} >= 9
+%global with_govirt 0
+%global with_spice 0
+%else
+%global with_govirt 1
+%global with_spice 1
 %endif
 
 Name: virt-viewer
-Version: 9.0
-Release: 4%{?dist}%{?extra_release}
+Version: 10.0
+Release: 1%{?dist}
 Summary: Virtual Machine Viewer
 License: GPLv2+
-URL: http://virt-manager.org/
-Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz
+URL: https://gitlab.com/virt-viewer/virt-viewer
+Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz
 Requires: openssh-clients
-Requires(post):   %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
 
-%if 0%{?enable_autotools}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gettext-devel
-BuildRequires: libtool
-%endif
-
-BuildRequires: make
 BuildRequires: gcc
-BuildRequires: pkgconfig(glib-2.0) >= 2.40
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.12
-BuildRequires: pkgconfig(libvirt) >= 0.10.0
-BuildRequires: pkgconfig(libvirt-glib-1.0) >= 0.1.8
-BuildRequires: pkgconfig(libxml-2.0) >= 2.6.0
-BuildRequires: pkgconfig(gtk-vnc-2.0) >= 0.4.0
+BuildRequires: meson
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(libvirt)
+BuildRequires: pkgconfig(libvirt-glib-1.0)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(gtk-vnc-2.0)
 BuildRequires: pkgconfig(vte-2.91)
 %if %{with_spice}
-BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.35
-BuildRequires: pkgconfig(spice-protocol) >= 0.12.7
+BuildRequires: pkgconfig(spice-client-gtk-3.0)
+BuildRequires: pkgconfig(spice-protocol)
 %endif
 BuildRequires: /usr/bin/pod2man
-BuildRequires: intltool
+BuildRequires: gettext
 %if %{with_govirt}
-BuildRequires: pkgconfig(govirt-1.0) >= 0.3.3
-%endif
-
-%if 0%{?fedora} >= 20
-Obsoletes: spice-client < 0.12.3-2
+BuildRequires: pkgconfig(govirt-1.0)
+BuildRequires: pkgconfig(rest-0.7)
 %endif
+BuildRequires: pkgconfig(bash-completion)
 
 
 %description
@@ -68,44 +48,31 @@ the display, and libvirt for looking up VNC/SPICE server details.
 %setup -q
 
 %build
-
-%if 0%{?enable_autotools}
-autoreconf -if
-%endif
-
-%if %{with_spice}
-%define spice_arg --with-spice-gtk
-%else
-%define spice_arg --without-spice-gtk
-%endif
-
-%if %{with_govirt}
-%define govirt_arg --with-ovirt
-%endif
-
-%configure %{spice_arg} %{govirt_arg} --with-vte --with-buildid=%{release} --disable-update-mimedb
-%__make %{?_smp_mflags}
-
+%meson -Dbuild-id=%{release}
+%meson_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%__make install  DESTDIR=$RPM_BUILD_ROOT
-%find_lang %{name}
+%meson_install
 
+%find_lang %{name}
 
 %files -f %{name}.lang
 %doc README.md COPYING AUTHORS ChangeLog NEWS
 %{_bindir}/%{name}
 %{_bindir}/remote-viewer
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/icons/hicolor/*/devices/*
 %{_datadir}/applications/remote-viewer.desktop
-%{_datadir}/appdata/remote-viewer.appdata.xml
+%{_datadir}/metainfo/remote-viewer.appdata.xml
 %{_datadir}/mime/packages/virt-viewer-mime.xml
 %{_mandir}/man1/virt-viewer.1*
 %{_mandir}/man1/remote-viewer.1*
+%{_datadir}/bash-completion/completions/virt-viewer
 
 %changelog
+* Wed Apr 21 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-1
+- Update to 10.0 release
+- Resolves: rhbz#1949526
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 9.0-4
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937