From d90eeed4de509ebaeafe2e6b826993c690ed3953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 8 Dec 2021 11:26:57 +0000 Subject: [PATCH] Rebase to 11.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#2028604, rhbz#2000528 Signed-off-by: Daniel P. Berrangé --- ...avoid-extra-hyphen-in-build-ID-value.patch | 31 ------------ ...itionally-define-REMOTE_VIEWER_OS_ID.patch | 48 ------------------- ...ensure-auth-entry-fields-are-cleared.patch | 33 ------------- sources | 2 +- virt-viewer.spec | 27 +++++------ 5 files changed, 12 insertions(+), 129 deletions(-) delete mode 100644 0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch delete mode 100644 0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch delete mode 100644 0007-src-ensure-auth-entry-fields-are-cleared.patch diff --git a/0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch b/0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch deleted file mode 100644 index f898b55..0000000 --- a/0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d07b1e5badb7624298d4bcfdcb6764b2a5d8a9de Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Mon, 26 Apr 2021 11:00:15 +0100 -Subject: [PATCH] config.h: avoid extra hyphen in build ID value -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The meson.build file already adds a hyphen. - -Signed-off-by: Daniel P. Berrangé ---- - config.h.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.h.in b/config.h.in -index 1d72f7e..eb4f03b 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -16,7 +16,7 @@ - #define _GNU_SOURCE - - /* Build version details */ --#define BUILDID "-@BUILDID@" -+#define BUILDID "@BUILDID@" - - /* Define to the full name and version of this package. */ - #define PACKAGE_STRING "virt-viewer @VERSION@" --- -2.31.1 - diff --git a/0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch b/0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch deleted file mode 100644 index ea7d60c..0000000 --- a/0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 65fe7379f85924b5bc3770fa9be5b08ba9a8704f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Mon, 26 Apr 2021 11:01:31 +0100 -Subject: [PATCH] config.h: conditionally define REMOTE_VIEWER_OS_ID -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It should only be set in config.h if it is not the empty string - -Signed-off-by: Daniel P. Berrangé ---- - config.h.in | 2 +- - meson.build | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/config.h.in b/config.h.in -index eb4f03b..0af0fa4 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -25,7 +25,7 @@ - #define PACKAGE_VERSION "@VERSION@" - - /* OS ID for this build */ --#define REMOTE_VIEWER_OS_ID "@OS_ID@" -+#mesondefine REMOTE_VIEWER_OS_ID - - /* Version number of package */ - #define VERSION "@VERSION@" -diff --git a/meson.build b/meson.build -index e5ed47b..2c92d75 100644 ---- a/meson.build -+++ b/meson.build -@@ -478,7 +478,10 @@ if id != '' - else - conf_data.set('BUILDID', '') - endif --conf_data.set('OS_ID', get_option('os-id')) -+osid = get_option('os-id') -+if osid != '' -+ conf_data.set('REMOTE_VIEWER_OS_ID', '"' + osid + '"') -+endif - - arr_version = meson.project_version().split('.') - --- -2.31.1 - diff --git a/0007-src-ensure-auth-entry-fields-are-cleared.patch b/0007-src-ensure-auth-entry-fields-are-cleared.patch deleted file mode 100644 index d57960a..0000000 --- a/0007-src-ensure-auth-entry-fields-are-cleared.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 73f567ea94eec04e6eb8bbac72d5c40518bca2b1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= -Date: Tue, 27 Apr 2021 11:28:57 +0100 -Subject: [PATCH] src: ensure auth entry fields are cleared -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If authentication fails we reshow the same authentication dialog box -again. Rather than leaving the previous incorrect information in the -text entry boxes we need to clear them. - -Signed-off-by: Daniel P. Berrangé ---- - src/virt-viewer-auth.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/virt-viewer-auth.c b/src/virt-viewer-auth.c -index 119d7f1..dbb3d25 100644 ---- a/src/virt-viewer-auth.c -+++ b/src/virt-viewer-auth.c -@@ -114,6 +114,8 @@ virt_viewer_auth_collect_credentials(VirtViewerAuth *self, - int response; - char *message; - -+ gtk_entry_set_text(GTK_ENTRY(self->credUsername), ""); -+ gtk_entry_set_text(GTK_ENTRY(self->credPassword), ""); - if (username) { - gtk_widget_show(self->credUsername); - gtk_widget_show(self->promptUsername); --- -2.31.1 - diff --git a/sources b/sources index 8b2ddb6..76e5b8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virt-viewer-10.0.tar.xz) = 82ed552337c3d71d762aed14e6fb20a123448fd5cf8c51f8f942ddd226ee2a4fa3ab8b9b893bbdde16628fb03363f2455e1d895074237d40ff567d642d216fd3 +SHA512 (virt-viewer-11.0.tar.xz) = 738034e15e40a7aaadd2646bf289c12409cbf2d06925d43baa50fa7bc8438188480d6b97687e9816427ac0a9dae84d205351715cb2f38afdbefa2dd1d134904a diff --git a/virt-viewer.spec b/virt-viewer.spec index 397948a..fb85b3a 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -9,22 +9,16 @@ %endif Name: virt-viewer -Version: 10.0 -Release: 3%{?dist} +Version: 11.0 +Release: 1%{?dist} Summary: Virtual Machine Viewer License: GPLv2+ URL: https://gitlab.com/virt-viewer/virt-viewer Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz Requires: openssh-clients -# Patches are numbered according to upstream order -# rhbz#1953282, upstream mr!94 -Patch0003: 0003-config.h-avoid-extra-hyphen-in-build-ID-value.patch -Patch0004: 0004-config.h-conditionally-define-REMOTE_VIEWER_OS_ID.patch - -# rhbz#1953933, upstream mr!95 -Patch0007: 0007-src-ensure-auth-entry-fields-are-cleared.patch - +# Our bash completion script uses virsh to list domains +Requires: libvirt-client BuildRequires: gcc BuildRequires: meson @@ -54,11 +48,7 @@ to virtual machines. It uses the GTK-VNC or SPICE-GTK widgets to provide the display, and libvirt for looking up VNC/SPICE server details. %prep -%setup -q -%patch0003 -p1 -%patch0004 -p1 - -%patch0007 -p1 +%autosetup -p1 %build @@ -85,7 +75,7 @@ the display, and libvirt for looking up VNC/SPICE server details. %find_lang %{name} %files -f %{name}.lang -%doc README.md COPYING AUTHORS ChangeLog NEWS +%doc README.md COPYING AUTHORS NEWS %{_bindir}/%{name} %{_bindir}/remote-viewer %{_datadir}/icons/hicolor/*/apps/* @@ -97,6 +87,11 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Wed Dec 8 2021 Daniel P. Berrangé - 11.0-1 +- Rebase to 11.0 release +- Add missing dep on libvirt-client for bash completion +- Resolves: rhbz#2028604, rhbz#2000528 + * Thu Aug 19 2021 Uri Lublin - 10.0-3 - Show OS-ID when running 'remote-viewer -V' Resolves: rhbz#1953282