From d86a8bf9bb07f698622bf992d1cc3bdb8788e070 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 02:04:02 +0000 Subject: [PATCH 01/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 687cf3e..90ccdc0 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -22,7 +22,7 @@ Name: virt-viewer Version: 2.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -161,6 +161,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Jan 12 2015 Daniel P. Berrange - 2.0-1 - Update to 2.0 release From b1c57a4559576e804a65a6818aa6b2ab14dcf807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 4 Dec 2015 15:41:24 +0100 Subject: [PATCH 02/58] Update to 3.0 release --- sources | 2 +- virt-viewer.spec | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 11e24c9..3c0c5ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b1e9a2029e0dfff741e17bb915f75ec virt-viewer-2.0.tar.gz +f36b1b85da943eba7ad72fd93ba63435 virt-viewer-3.0.tar.gz diff --git a/virt-viewer.spec b/virt-viewer.spec index 90ccdc0..4346adc 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -21,8 +21,8 @@ %endif Name: virt-viewer -Version: 2.0 -Release: 2%{?dist}%{?extra_release} +Version: 3.0 +Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -57,11 +57,11 @@ BuildRequires: gtk-vnc-devel >= 0.3.8 %endif %if %{with_spice} %if %{with_gtk3} -BuildRequires: spice-gtk3-devel >= 0.22 +BuildRequires: spice-gtk3-devel >= 0.30 %else -BuildRequires: spice-gtk-devel >= 0.22 +BuildRequires: spice-gtk-devel >= 0.30 %endif -BuildRequires: spice-protocol >= 0.10.1 +BuildRequires: spice-protocol >= 0.12.7 %endif BuildRequires: /usr/bin/pod2man BuildRequires: intltool @@ -151,6 +151,8 @@ fi %{_datadir}/%{name}/ui/virt-viewer-about.xml %{_datadir}/%{name}/ui/virt-viewer-guest-details.xml %{_datadir}/%{name}/ui/virt-viewer-vm-connection.xml +%{_datadir}/%{name}/ui/virt-viewer-preferences.xml +%{_datadir}/%{name}/ui/remote-viewer-connect.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/devices/* %{_datadir}/applications/remote-viewer.desktop @@ -161,6 +163,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Fri Dec 4 2015 Fabiano Fidêncio - 3.0-1 +- Update to 3.0 release + * Fri Jun 19 2015 Fedora Release Engineering - 2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From a97b68ff3214fcf7b67811e27a85e379151bcfe7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:46:22 +0000 Subject: [PATCH 03/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 4346adc..b32664c 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -22,7 +22,7 @@ Name: virt-viewer Version: 3.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -163,6 +163,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Dec 4 2015 Fabiano Fidêncio - 3.0-1 - Update to 3.0 release From 4eb2a007719cec0bcc08d7334c98199821fc453e Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 22 Jun 2016 17:13:09 +0200 Subject: [PATCH 04/58] Rebuild for spice-gtk ABI break --- virt-viewer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index b32664c..7142136 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -22,7 +22,7 @@ Name: virt-viewer Version: 3.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -57,7 +57,7 @@ BuildRequires: gtk-vnc-devel >= 0.3.8 %endif %if %{with_spice} %if %{with_gtk3} -BuildRequires: spice-gtk3-devel >= 0.30 +BuildRequires: spice-gtk3-devel >= 0.32 %else BuildRequires: spice-gtk-devel >= 0.30 %endif @@ -163,6 +163,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Wed Jun 22 2016 Christophe Fergeau - 3.0-3 +- Rebuild for spice-gtk ABI break + * Fri Feb 05 2016 Fedora Release Engineering - 3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 926a661a8eb338b91a3fcdcdeee502258016385a Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 30 Jun 2016 15:19:24 +0100 Subject: [PATCH 05/58] Update to virt-viewer 4.0 release --- sources | 2 +- virt-viewer.spec | 57 +++++++++++++----------------------------------- 2 files changed, 16 insertions(+), 43 deletions(-) diff --git a/sources b/sources index 3c0c5ae..bf55c68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f36b1b85da943eba7ad72fd93ba63435 virt-viewer-3.0.tar.gz +d92d09ba29413c4aa0498e7cccf4eea2 virt-viewer-4.0.tar.gz diff --git a/virt-viewer.spec b/virt-viewer.spec index 7142136..a9031d3 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -5,11 +5,6 @@ # touch configure.ac or Makefile.am. %{!?enable_autotools:%define enable_autotools 0} -%define with_gtk3 0 -%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 -%define with_gtk3 1 -%endif - %define with_spice 0 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 %define with_spice 1 @@ -21,8 +16,8 @@ %endif Name: virt-viewer -Version: 3.0 -Release: 3%{?dist}%{?extra_release} +Version: 4.0 +Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -42,31 +37,20 @@ BuildRequires: gettext-devel BuildRequires: libtool %endif -BuildRequires: glib2-devel >= 2.22.0 -%if %{with_gtk3} -BuildRequires: gtk3-devel >= 3.0 -%else -BuildRequires: gtk2-devel >= 2.18.0 -%endif -BuildRequires: libvirt-devel >= 0.10.0 -BuildRequires: libxml2-devel >= 2.6.0 -%if %{with_gtk3} -BuildRequires: gtk-vnc2-devel >= 0.4.0 -%else -BuildRequires: gtk-vnc-devel >= 0.3.8 -%endif +BuildRequires: pkgconfig(glib-2.0) >= 2.38 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.10 +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 %if %{with_spice} -%if %{with_gtk3} -BuildRequires: spice-gtk3-devel >= 0.32 -%else -BuildRequires: spice-gtk-devel >= 0.30 -%endif -BuildRequires: spice-protocol >= 0.12.7 +BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.31 +BuildRequires: pkgconfig(spice-protocol) >= 0.12.7 %endif BuildRequires: /usr/bin/pod2man BuildRequires: intltool %if %{with_govirt} -BuildRequires: libgovirt-devel >= 0.3.2 +BuildRequires: pkgconfig(govirt-1.0) >= 0.3.2 %endif %if 0%{?fedora} >= 20 @@ -94,12 +78,6 @@ autoreconf -if %define spice_arg --without-spice-gtk %endif -%if %{with_gtk3} -%define gtk_arg --with-gtk=3.0 -%else -%define gtk_arg --with-gtk=2.0 -%endif - %if %{with_govirt} %define govirt_arg --with-ovirt %endif @@ -144,18 +122,10 @@ fi %doc README COPYING AUTHORS ChangeLog NEWS %{_bindir}/%{name} %{_bindir}/remote-viewer -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/ui/ -%{_datadir}/%{name}/ui/virt-viewer.xml -%{_datadir}/%{name}/ui/virt-viewer-auth.xml -%{_datadir}/%{name}/ui/virt-viewer-about.xml -%{_datadir}/%{name}/ui/virt-viewer-guest-details.xml -%{_datadir}/%{name}/ui/virt-viewer-vm-connection.xml -%{_datadir}/%{name}/ui/virt-viewer-preferences.xml -%{_datadir}/%{name}/ui/remote-viewer-connect.xml %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/hicolor/*/devices/* %{_datadir}/applications/remote-viewer.desktop +%{_datadir}/appdata/remote-viewer.appdata.xml %{_datadir}/mime/packages/virt-viewer-mime.xml %ghost %{_libexecdir}/spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer @@ -163,6 +133,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Thu Jun 30 2016 Daniel P. Berrange - 4.0-1 +- Update to 4.0 release + * Wed Jun 22 2016 Christophe Fergeau - 3.0-3 - Rebuild for spice-gtk ABI break From 9ffca9153dcde85f458b872acac69efeb8f0958c Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 5 Oct 2016 11:44:29 +0200 Subject: [PATCH 06/58] Fix virt-viewer window gradually getting bigger and bigger --- ...ing-problem-with-recent-gtk-versions.patch | 48 +++++++++++++++++++ virt-viewer.spec | 8 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-resizing-problem-with-recent-gtk-versions.patch diff --git a/0001-Fix-resizing-problem-with-recent-gtk-versions.patch b/0001-Fix-resizing-problem-with-recent-gtk-versions.patch new file mode 100644 index 0000000..612bf7f --- /dev/null +++ b/0001-Fix-resizing-problem-with-recent-gtk-versions.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jonathon Jongsma +Date: Fri, 22 Jul 2016 16:43:41 -0500 +Subject: [virt-viewer] Fix resizing problem with recent gtk versions + +When using client-side decorations, as well as in certain other +situations (wayland, and windows in some cases), the window gradually +resizes larger and larger. + +This is caused by a change in how gtk interprets the sizes passed to +gtk_window_resize(), particularly when client-side decorations (CSD) are +involved. For example, In the past this size was assumed to include the +size of the CSD, but now it it assumes that the sizes only represent the +size of the window's content, without any decorations. However, +gtk_widget_get_preferred_size() (when called on a GtkWindow*), returns a +size that includes the size of the CSD. So +virt_viewer_window_queue_resize() was essentially growing the window by +the size of the CSD every time it was called. + +To work around this issue, we need to calculate the preferred size of +the window's child, not the size of the entire window (including CSD). +Then we add the width of the window's border (just to be safe) and pass +those values to gtk_window_resize(). +--- + src/virt-viewer-window.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c +index 7e6b93f..99fd102 100644 +--- a/src/virt-viewer-window.c ++++ b/src/virt-viewer-window.c +@@ -411,10 +411,14 @@ virt_viewer_window_queue_resize(VirtViewerWindow *self) + { + VirtViewerWindowPrivate *priv = self->priv; + GtkRequisition nat; ++ GtkWidget *child; ++ guint border; + ++ border = gtk_container_get_border_width(GTK_CONTAINER(priv->window)); ++ child = gtk_bin_get_child(GTK_BIN(priv->window)); + gtk_window_set_default_size(GTK_WINDOW(priv->window), -1, -1); +- gtk_widget_get_preferred_size(priv->window, NULL, &nat); +- gtk_window_resize(GTK_WINDOW(priv->window), nat.width, nat.height); ++ gtk_widget_get_preferred_size(child, NULL, &nat); ++ gtk_window_resize(GTK_WINDOW(priv->window), nat.width + border, nat.height + border); + } + + static void diff --git a/virt-viewer.spec b/virt-viewer.spec index a9031d3..58e37a7 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,12 +17,13 @@ Name: virt-viewer Version: 4.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz +Patch0: 0001-Fix-resizing-problem-with-recent-gtk-versions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openssh-clients Requires(post): %{_sbindir}/update-alternatives @@ -65,6 +66,7 @@ the display, and libvirt for looking up VNC/SPICE server details. %prep %setup -q +%patch0 -p1 %build @@ -133,6 +135,10 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Wed Oct 05 2016 Christophe Fergeau 4.0-2 +- Add upstream patch fixing virt-viewer window gradually getting bigger and + bigger + * Thu Jun 30 2016 Daniel P. Berrange - 4.0-1 - Update to 4.0 release From ae9adcab9c3edf67aef091745e510cbfcd2c8c18 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 24 Nov 2016 16:21:44 +0000 Subject: [PATCH 07/58] Update to 5.0 release Signed-off-by: Daniel P. Berrange --- sources | 2 +- virt-viewer.spec | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sources b/sources index bf55c68..165272f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d92d09ba29413c4aa0498e7cccf4eea2 virt-viewer-4.0.tar.gz +b30d5ea7715a2f6e12e0e9727abe7cb4 virt-viewer-5.0.tar.gz diff --git a/virt-viewer.spec b/virt-viewer.spec index 58e37a7..36d8a9c 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -16,14 +16,13 @@ %endif Name: virt-viewer -Version: 4.0 -Release: 2%{?dist}%{?extra_release} +Version: 5.0 +Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -Patch0: 0001-Fix-resizing-problem-with-recent-gtk-versions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openssh-clients Requires(post): %{_sbindir}/update-alternatives @@ -66,7 +65,6 @@ the display, and libvirt for looking up VNC/SPICE server details. %prep %setup -q -%patch0 -p1 %build @@ -135,6 +133,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Thu Nov 24 2016 Daniel P. Berrange - 5.0-1 +- Update to 5.0 release + * Wed Oct 05 2016 Christophe Fergeau 4.0-2 - Add upstream patch fixing virt-viewer window gradually getting bigger and bigger From 4bc65c496c385c14dcb26cd554ed210a705292cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:07:30 +0000 Subject: [PATCH 08/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 36d8a9c..708cbdd 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 5.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -133,6 +133,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Nov 24 2016 Daniel P. Berrange - 5.0-1 - Update to 5.0 release From 6b1ed24e2a511e3d51f5c1062eb720e8828c76f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:21:45 +0000 Subject: [PATCH 09/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 708cbdd..bff7cb0 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 5.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -133,6 +133,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 52b6a9cca38b435b7e5c73fff411a6ea0c472523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:05:30 +0000 Subject: [PATCH 10/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index bff7cb0..ba9ed84 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 5.0 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -133,6 +133,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 1141ae79f02844360245707f2aa2181e949df4c0 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 15 Aug 2017 15:13:32 +0100 Subject: [PATCH 11/58] Update to 6.0 release Signed-off-by: Daniel P. Berrange --- ...ing-problem-with-recent-gtk-versions.patch | 48 ------------------- sources | 2 +- virt-viewer.spec | 13 +++-- 3 files changed, 9 insertions(+), 54 deletions(-) delete mode 100644 0001-Fix-resizing-problem-with-recent-gtk-versions.patch diff --git a/0001-Fix-resizing-problem-with-recent-gtk-versions.patch b/0001-Fix-resizing-problem-with-recent-gtk-versions.patch deleted file mode 100644 index 612bf7f..0000000 --- a/0001-Fix-resizing-problem-with-recent-gtk-versions.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jonathon Jongsma -Date: Fri, 22 Jul 2016 16:43:41 -0500 -Subject: [virt-viewer] Fix resizing problem with recent gtk versions - -When using client-side decorations, as well as in certain other -situations (wayland, and windows in some cases), the window gradually -resizes larger and larger. - -This is caused by a change in how gtk interprets the sizes passed to -gtk_window_resize(), particularly when client-side decorations (CSD) are -involved. For example, In the past this size was assumed to include the -size of the CSD, but now it it assumes that the sizes only represent the -size of the window's content, without any decorations. However, -gtk_widget_get_preferred_size() (when called on a GtkWindow*), returns a -size that includes the size of the CSD. So -virt_viewer_window_queue_resize() was essentially growing the window by -the size of the CSD every time it was called. - -To work around this issue, we need to calculate the preferred size of -the window's child, not the size of the entire window (including CSD). -Then we add the width of the window's border (just to be safe) and pass -those values to gtk_window_resize(). ---- - src/virt-viewer-window.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c -index 7e6b93f..99fd102 100644 ---- a/src/virt-viewer-window.c -+++ b/src/virt-viewer-window.c -@@ -411,10 +411,14 @@ virt_viewer_window_queue_resize(VirtViewerWindow *self) - { - VirtViewerWindowPrivate *priv = self->priv; - GtkRequisition nat; -+ GtkWidget *child; -+ guint border; - -+ border = gtk_container_get_border_width(GTK_CONTAINER(priv->window)); -+ child = gtk_bin_get_child(GTK_BIN(priv->window)); - gtk_window_set_default_size(GTK_WINDOW(priv->window), -1, -1); -- gtk_widget_get_preferred_size(priv->window, NULL, &nat); -- gtk_window_resize(GTK_WINDOW(priv->window), nat.width, nat.height); -+ gtk_widget_get_preferred_size(child, NULL, &nat); -+ gtk_window_resize(GTK_WINDOW(priv->window), nat.width + border, nat.height + border); - } - - static void diff --git a/sources b/sources index 165272f..437dbef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b30d5ea7715a2f6e12e0e9727abe7cb4 virt-viewer-5.0.tar.gz +SHA512 (virt-viewer-6.0.tar.gz) = 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2 diff --git a/virt-viewer.spec b/virt-viewer.spec index ba9ed84..56392dd 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -16,8 +16,8 @@ %endif Name: virt-viewer -Version: 5.0 -Release: 4%{?dist}%{?extra_release} +Version: 6.0 +Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -38,13 +38,13 @@ BuildRequires: libtool %endif BuildRequires: pkgconfig(glib-2.0) >= 2.38 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.10 +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 %if %{with_spice} -BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.31 +BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.33 BuildRequires: pkgconfig(spice-protocol) >= 0.12.7 %endif BuildRequires: /usr/bin/pod2man @@ -119,7 +119,7 @@ fi %files -f %{name}.lang %defattr(-,root,root,-) -%doc README COPYING AUTHORS ChangeLog NEWS +%doc README.md COPYING AUTHORS ChangeLog NEWS %{_bindir}/%{name} %{_bindir}/remote-viewer %{_datadir}/icons/hicolor/*/apps/* @@ -133,6 +133,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Tue Aug 15 2017 Daniel P. Berrange - 6.0-1 +- Update to 6.0 release + * Thu Aug 03 2017 Fedora Release Engineering - 5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From faed06146a7f93342954e8c503ab7de2c12876ea Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:46:53 +0100 Subject: [PATCH 12/58] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- virt-viewer.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 56392dd..76a8a21 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 6.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -98,24 +98,13 @@ install -m 0755 data/spice-xpi-client-remote-viewer %{buildroot}%{_libexecdir}/ rm -rf $RPM_BUILD_ROOT %post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : %{_sbindir}/update-alternatives --install %{_libexecdir}/spice-xpi-client \ spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer 25 -/usr/bin/update-desktop-database -q %{_datadir}/applications %postun if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %{_sbindir}/update-alternatives --remove spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer fi -/usr/bin/update-desktop-database -q %{_datadir}/applications - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -133,6 +122,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Thu Jan 18 2018 Igor Gnatenko - 6.0-2 +- Remove obsolete scriptlets + * Tue Aug 15 2017 Daniel P. Berrange - 6.0-1 - Update to 6.0 release From ec6322d2997e61e38e100fbde07a793fd9898878 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:34:15 +0000 Subject: [PATCH 13/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 76a8a21..ccd5525 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 6.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -122,6 +122,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 18 2018 Igor Gnatenko - 6.0-2 - Remove obsolete scriptlets From f9fb2adcbca1257327dfb89a19ba95cbf985f7b4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:47:47 +0100 Subject: [PATCH 14/58] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- virt-viewer.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index ccd5525..878b4b5 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -23,7 +23,6 @@ Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openssh-clients Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives From 6aaa2f1ef42d75728fa9239335177742418f61f0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:58:03 +0100 Subject: [PATCH 15/58] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- virt-viewer.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 878b4b5..f9af858 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -93,9 +93,6 @@ touch %{buildroot}%{_libexecdir}/spice-xpi-client install -m 0755 data/spice-xpi-client-remote-viewer %{buildroot}%{_libexecdir}/ %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT - %post %{_sbindir}/update-alternatives --install %{_libexecdir}/spice-xpi-client \ spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer 25 From ec237e15b2b3229c739963a103740bcb746bde3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 28 Jun 2018 17:35:53 +0100 Subject: [PATCH 16/58] Rebuild for spice-controller so being removed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index f9af858..564dc77 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 6.0 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -118,6 +118,9 @@ fi %{_mandir}/man1/remote-viewer.1* %changelog +* Thu Jun 28 2018 Daniel P. Berrangé - 6.0-4 +- Rebuild for spice-controller so being removed + * Fri Feb 09 2018 Fedora Release Engineering - 6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d5eb29483393ecc9f93a355499bb172e456c4a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 28 Jun 2018 20:40:15 +0200 Subject: [PATCH 17/58] Add missing patch for spice-controller so being removed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#1596215 - Rebuild virt-viewer with latest spice-glib Signed-off-by: Fabiano Fidêncio --- ...-interface-is-being-removed-from-spi.patch | 676 ++++++++++++++++++ virt-viewer.spec | 28 +- 2 files changed, 687 insertions(+), 17 deletions(-) create mode 100644 0001-spice-controller-interface-is-being-removed-from-spi.patch diff --git a/0001-spice-controller-interface-is-being-removed-from-spi.patch b/0001-spice-controller-interface-is-being-removed-from-spi.patch new file mode 100644 index 0000000..16c3bbb --- /dev/null +++ b/0001-spice-controller-interface-is-being-removed-from-spi.patch @@ -0,0 +1,676 @@ +From 30c34a6cb642ed3d232db1ea8b14bfbb112c6f76 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= +Date: Thu, 28 Jun 2018 20:34:40 +0200 +Subject: [PATCH] spice controller interface is being removed from spice-gtk. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Marc-André Lureau +Reviewed-by: Victor Toso +Signed-off-by: Fabiano Fidêncio +--- + configure.ac | 3 +- + data/Makefile.am | 1 - + data/spice-xpi-client-remote-viewer | 6 - + data/virt-viewer.wxs.in | 11 - + man/remote-viewer.pod | 6 - + src/Makefile.am | 2 - + src/remote-viewer.c | 448 +--------------------------- + 7 files changed, 5 insertions(+), 472 deletions(-) + delete mode 100644 data/spice-xpi-client-remote-viewer + +diff --git a/configure.ac b/configure.ac +index d5eb258..4f5e3df 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -159,13 +159,12 @@ AC_ARG_WITH([spice-gtk], + AS_IF([test "x$with_spice_gtk" != "xno" && test "x$with_spice_gtk" != "xyes"], + [PKG_CHECK_EXISTS([spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED + spice-client-glib-2.0 >= $SPICE_GTK_REQUIRED +- spice-controller spice-protocol >= $SPICE_PROTOCOL_REQUIRED], ++ spice-protocol >= $SPICE_PROTOCOL_REQUIRED], + [with_spice_gtk=yes], [with_spice_gtk=no])]) + + AS_IF([test "x$with_spice_gtk" = "xyes"], + [PKG_CHECK_MODULES(SPICE_GTK, [spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED + spice-client-glib-2.0 >= $SPICE_GTK_REQUIRED])] +- [PKG_CHECK_MODULES(SPICE_CONTROLLER, [spice-controller])] + [PKG_CHECK_MODULES(SPICE_PROTOCOL, [spice-protocol >= $SPICE_PROTOCOL_REQUIRED])] + [AC_DEFINE([HAVE_SPICE_GTK], 1, [Have spice-gtk?])] + ) +diff --git a/data/Makefile.am b/data/Makefile.am +index 55718d9..54be2b1 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -3,7 +3,6 @@ CLEANFILES = + MANUFACTURER = Virt Manager Project + + EXTRA_DIST = \ +- spice-xpi-client-remote-viewer \ + virt-viewer.wxs.in \ + $(NULL) + +diff --git a/data/spice-xpi-client-remote-viewer b/data/spice-xpi-client-remote-viewer +deleted file mode 100644 +index 3109c66..0000000 +--- a/data/spice-xpi-client-remote-viewer ++++ /dev/null +@@ -1,6 +0,0 @@ +-#!/bin/sh +- +-logger -t spice "starting remote-viewer --spice-controller $@..." +-env | logger -t spice +-exec remote-viewer --spice-controller "$@" 2>&1 | logger -t spice +-logger -t spice "remote-viewer execution failed" +diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in +index 9838265..2047720 100644 +--- a/data/virt-viewer.wxs.in ++++ b/data/virt-viewer.wxs.in +@@ -55,16 +55,6 @@ + NOT NEWERVERSIONDETECTED + + +- +- +- +- +- +- +- +- +- +- + + + +@@ -129,7 +119,6 @@ + + + +- + + + +diff --git a/man/remote-viewer.pod b/man/remote-viewer.pod +index 60ea3a6..a050f4c 100644 +--- a/man/remote-viewer.pod ++++ b/man/remote-viewer.pod +@@ -55,12 +55,6 @@ CONFIGURATION section below. + + Set the window title to B + +-=item --spice-controller +- +-Use the SPICE controller to initialize the connection with the SPICE +-server. This option is used by the SPICE browser addons to allow web +-page to start a client. +- + =item --debug + + Print debugging information +diff --git a/src/Makefile.am b/src/Makefile.am +index e87bcc7..d17f4c1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -178,11 +178,9 @@ remote_viewer_SOURCES = \ + $(NULL) + remote_viewer_LDFLAGS = \ + $(COMMON_LIBS) \ +- $(SPICE_CONTROLLER_LIBS) \ + $(NULL) + remote_viewer_CFLAGS = \ + $(COMMON_CFLAGS) \ +- $(SPICE_CONTROLLER_CFLAGS) \ + $(NULL) + remote_viewer_LDADD = \ + libvirt-viewer-util.la \ +diff --git a/src/remote-viewer.c b/src/remote-viewer.c +index b132214..e25208d 100644 +--- a/src/remote-viewer.c ++++ b/src/remote-viewer.c +@@ -36,7 +36,6 @@ + #endif + + #ifdef HAVE_SPICE_GTK +-#include <spice-controller.h> + #include "virt-viewer-session-spice.h" + #endif + +@@ -49,10 +48,6 @@ + #include "remote-viewer-connect.h" + + struct _RemoteViewerPrivate { +-#ifdef HAVE_SPICE_GTK +- SpiceCtrlController *controller; +- SpiceCtrlForeignMenu *ctrl_foreign_menu; +-#endif + #ifdef HAVE_OVIRT + OvirtForeignMenu *ovirt_foreign_menu; + #endif +@@ -78,33 +73,15 @@ static OvirtVm * choose_vm(GtkWindow *main_window, + #endif + + static gboolean remote_viewer_start(VirtViewerApp *self, GError **error); +-#ifdef HAVE_SPICE_GTK +-static gboolean remote_viewer_activate(VirtViewerApp *self, GError **error); +-static void remote_viewer_window_added(GtkApplication *app, GtkWindow *w); +-static void spice_foreign_menu_updated(RemoteViewer *self); +-static void foreign_menu_title_changed(SpiceCtrlForeignMenu *menu, GParamSpec *pspec, RemoteViewer *self); +-#endif + + static void + remote_viewer_dispose (GObject *object) + { +-#if defined(HAVE_SPICE_GTK) || defined(HAVE_OVIRT) ++#if defined(HAVE_OVIRT) + RemoteViewer *self = REMOTE_VIEWER(object); + RemoteViewerPrivate *priv = self->priv; + #endif + +-#ifdef HAVE_SPICE_GTK +- if (priv->controller) { +- g_object_unref(priv->controller); +- priv->controller = NULL; +- } +- +- if (priv->ctrl_foreign_menu) { +- g_object_unref(priv->ctrl_foreign_menu); +- priv->ctrl_foreign_menu = NULL; +- } +-#endif +- + #ifdef HAVE_OVIRT + if (priv->ovirt_foreign_menu) { + g_object_unref(priv->ovirt_foreign_menu); +@@ -132,7 +109,6 @@ remote_viewer_deactivated(VirtViewerApp *app, gboolean connect_error) + + static gchar **opt_args = NULL; + static char *opt_title = NULL; +-static gboolean opt_controller = FALSE; + + static void + remote_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, GOptionGroup *group) +@@ -140,10 +116,6 @@ remote_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, G + static const GOptionEntry options[] = { + { "title", 't', 0, G_OPTION_ARG_STRING, &opt_title, + N_("Set window title"), NULL }, +-#ifdef HAVE_SPICE_GTK +- { "spice-controller", '\0', 0, G_OPTION_ARG_NONE, &opt_controller, +- N_("Open connection using Spice controller communication"), NULL }, +-#endif + { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &opt_args, + NULL, "URI|VV-FILE" }, + { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } +@@ -184,27 +156,7 @@ remote_viewer_local_command_line (GApplication *gapp, + g_object_set(app, "guri", opt_args[0], NULL); + } + +-#ifdef HAVE_SPICE_GTK +- if (opt_controller) { +- if (opt_args) { +- g_printerr(_("\nError: extra arguments given while using Spice controller\n\n")); +- ret = TRUE; +- *status = 1; +- goto end; +- } +- +- self->priv->controller = spice_ctrl_controller_new(); +- self->priv->ctrl_foreign_menu = spice_ctrl_foreign_menu_new(); +- +- g_object_set(self, "guest-name", "defined by Spice controller", NULL); +- +- g_signal_connect(self->priv->ctrl_foreign_menu, "notify::title", +- G_CALLBACK(foreign_menu_title_changed), +- self); +- } +-#endif +- +- if (opt_title && !opt_controller) ++ if (opt_title) + g_object_set(app, "title", opt_title, NULL); + + end: +@@ -241,7 +193,6 @@ static void + remote_viewer_class_init (RemoteViewerClass *klass) + { + GObjectClass *object_class = G_OBJECT_CLASS (klass); +- GtkApplicationClass *gtk_app_class = GTK_APPLICATION_CLASS(klass); + VirtViewerAppClass *app_class = VIRT_VIEWER_APP_CLASS (klass); + GApplicationClass *g_app_class = G_APPLICATION_CLASS(klass); + +@@ -255,12 +206,6 @@ remote_viewer_class_init (RemoteViewerClass *klass) + app_class->start = remote_viewer_start; + app_class->deactivated = remote_viewer_deactivated; + app_class->add_option_entries = remote_viewer_add_option_entries; +-#ifdef HAVE_SPICE_GTK +- app_class->activate = remote_viewer_activate; +- gtk_app_class->window_added = remote_viewer_window_added; +-#else +- (void) gtk_app_class; +-#endif + + #ifdef HAVE_OVIRT + g_object_class_install_property(object_class, +@@ -288,217 +233,7 @@ remote_viewer_new(void) + NULL); + } + +-#ifdef HAVE_SPICE_GTK +-static void +-foreign_menu_title_changed(SpiceCtrlForeignMenu *menu G_GNUC_UNUSED, +- GParamSpec *pspec G_GNUC_UNUSED, +- RemoteViewer *self) +-{ +- gboolean has_focus; +- +- g_object_get(G_OBJECT(self), "has-focus", &has_focus, NULL); +- /* FIXME: use a proper "new client connected" event +- ** a foreign menu client set the title when connecting, +- ** inform of focus state at that time. +- */ +- spice_ctrl_foreign_menu_app_activated_msg(self->priv->ctrl_foreign_menu, has_focus); +- +- /* update menu title */ +- spice_foreign_menu_updated(self); +-} +- +-static void +-spice_ctrl_do_connect(SpiceCtrlController *ctrl G_GNUC_UNUSED, +- VirtViewerApp *self) +-{ +- GError *error = NULL; +- +- if (!virt_viewer_app_initial_connect(self, &error)) { +- const gchar *msg = error ? error->message : +- _("Failed to initiate connection"); +- virt_viewer_app_simple_message_dialog(self, msg); +- g_clear_error(&error); +- } +-} +- +-static void +-spice_ctrl_show(SpiceCtrlController *ctrl G_GNUC_UNUSED, RemoteViewer *self) +-{ +- virt_viewer_app_show_display(VIRT_VIEWER_APP(self)); +-} +- +-static void +-spice_ctrl_hide(SpiceCtrlController *ctrl G_GNUC_UNUSED, RemoteViewer *self) +-{ +- virt_viewer_app_show_status(VIRT_VIEWER_APP(self), _("Display disabled by controller")); +-} +- +-static void +-spice_menuitem_activate_cb(GtkMenuItem *mi, GObject *ctrl) +-{ +- SpiceCtrlMenuItem *menuitem = g_object_get_data(G_OBJECT(mi), "spice-menuitem"); +- +- g_return_if_fail(menuitem != NULL); +- if (gtk_menu_item_get_submenu(mi)) +- return; +- +- if (SPICE_CTRL_IS_CONTROLLER(ctrl)) +- spice_ctrl_controller_menu_item_click_msg(SPICE_CTRL_CONTROLLER(ctrl), menuitem->id); +- else if (SPICE_CTRL_IS_FOREIGN_MENU(ctrl)) +- spice_ctrl_foreign_menu_menu_item_click_msg(SPICE_CTRL_FOREIGN_MENU(ctrl), menuitem->id); +-} +- +-static GtkWidget * +-ctrlmenu_to_gtkmenu (RemoteViewer *self, SpiceCtrlMenu *ctrlmenu, GObject *ctrl) +-{ +- GList *l; +- GtkWidget *menu = gtk_menu_new(); +- guint n = 0; +- +- for (l = ctrlmenu->items; l != NULL; l = l->next) { +- SpiceCtrlMenuItem *menuitem = l->data; +- GtkWidget *item; +- char *s; +- if (menuitem->text == NULL) { +- g_warn_if_reached(); +- continue; +- } +- +- for (s = menuitem->text; *s; s++) +- if (*s == '&') +- *s = '_'; +- +- if (g_str_equal(menuitem->text, "-")) { +- item = gtk_separator_menu_item_new(); +- } else if (menuitem->flags & CONTROLLER_MENU_FLAGS_CHECKED) { +- item = gtk_check_menu_item_new_with_mnemonic(menuitem->text); +- g_object_set(item, "active", TRUE, NULL); +- } else { +- item = gtk_menu_item_new_with_mnemonic(menuitem->text); +- } +- +- if (menuitem->flags & (CONTROLLER_MENU_FLAGS_GRAYED | CONTROLLER_MENU_FLAGS_DISABLED)) +- gtk_widget_set_sensitive(item, FALSE); +- +- g_object_set_data_full(G_OBJECT(item), "spice-menuitem", +- g_object_ref(menuitem), g_object_unref); +- g_signal_connect(item, "activate", G_CALLBACK(spice_menuitem_activate_cb), ctrl); +- gtk_menu_attach(GTK_MENU (menu), item, 0, 1, n, n + 1); +- n += 1; +- +- if (menuitem->submenu) { +- gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), +- ctrlmenu_to_gtkmenu(self, menuitem->submenu, ctrl)); +- } +- } +- +- if (n == 0) { +- g_object_ref_sink(menu); +- g_object_unref(menu); +- menu = NULL; +- } +- +- gtk_widget_show_all(menu); +- return menu; +-} +- +-static void +-spice_menu_update(RemoteViewer *self, VirtViewerWindow *win) +-{ +- GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "spice-menu"); +- SpiceCtrlMenu *menu; +- +- if (self->priv->controller == NULL) +- return; +- +- if (menuitem != NULL) +- gtk_widget_destroy(menuitem); +- +- { +- GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu")); +- menuitem = gtk_menu_item_new_with_label("Spice"); +- gtk_menu_shell_append(shell, menuitem); +- g_object_set_data(G_OBJECT(win), "spice-menu", menuitem); +- } +- +- g_object_get(self->priv->controller, "menu", &menu, NULL); +- if (menu == NULL || g_list_length(menu->items) == 0) { +- gtk_widget_set_visible(menuitem, FALSE); +- } else { +- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), +- ctrlmenu_to_gtkmenu(self, menu, G_OBJECT(self->priv->controller))); +- gtk_widget_set_visible(menuitem, TRUE); +- } +- +- if (menu != NULL) +- g_object_unref(menu); +-} +- +-static void +-spice_menu_update_each(gpointer value, +- gpointer user_data) +-{ +- spice_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value)); +-} +- +-static void +-spice_ctrl_menu_updated(RemoteViewer *self) +-{ +- GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); +- +- g_debug("Spice controller menu updated"); +- +- g_list_foreach(windows, spice_menu_update_each, self); +-} +- +-static void +-spice_foreign_menu_update(RemoteViewer *self, VirtViewerWindow *win) +-{ +- GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "foreign-menu"); +- SpiceCtrlMenu *menu; +- +- if (self->priv->ctrl_foreign_menu == NULL) +- return; +- +- if (menuitem != NULL) +- gtk_widget_destroy(menuitem); +- +- { +- GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu")); +- const gchar *title = spice_ctrl_foreign_menu_get_title(self->priv->ctrl_foreign_menu); +- menuitem = gtk_menu_item_new_with_label(title); +- gtk_menu_shell_append(shell, menuitem); +- g_object_set_data(G_OBJECT(win), "foreign-menu", menuitem); +- } +- +- g_object_get(self->priv->ctrl_foreign_menu, "menu", &menu, NULL); +- if (menu == NULL || g_list_length(menu->items) == 0) { +- gtk_widget_set_visible(menuitem, FALSE); +- } else { +- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), +- ctrlmenu_to_gtkmenu(self, menu, G_OBJECT(self->priv->ctrl_foreign_menu))); +- gtk_widget_set_visible(menuitem, TRUE); +- } +- g_object_unref(menu); +-} +- +-static void +-spice_foreign_menu_update_each(gpointer value, +- gpointer user_data) +-{ +- spice_foreign_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value)); +-} +- +-static void +-spice_foreign_menu_updated(RemoteViewer *self) +-{ +- GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); +- +- g_debug("Spice foreign menu updated"); +- +- g_list_foreach(windows, spice_foreign_menu_update_each, self); +-} +- ++#if defined(HAVE_SPICE_GTK) && defined(HAVE_OVIRT) + static SpiceSession * + remote_viewer_get_spice_session(RemoteViewer *self) + { +@@ -514,158 +249,6 @@ remote_viewer_get_spice_session(RemoteViewer *self) + + return session; + } +- +-static void +-app_notified(VirtViewerApp *app, +- GParamSpec *pspec, +- RemoteViewer *self) +-{ +- GValue value = G_VALUE_INIT; +- +- g_value_init(&value, pspec->value_type); +- g_object_get_property(G_OBJECT(app), pspec->name, &value); +- +- if (g_str_equal(pspec->name, "has-focus")) { +- if (self->priv->ctrl_foreign_menu) +- spice_ctrl_foreign_menu_app_activated_msg(self->priv->ctrl_foreign_menu, g_value_get_boolean(&value)); +- } +- +- g_value_unset(&value); +-} +- +-static void +-spice_ctrl_notified(SpiceCtrlController *ctrl, +- GParamSpec *pspec, +- RemoteViewer *self) +-{ +- SpiceSession *session = remote_viewer_get_spice_session(self); +- GValue value = G_VALUE_INIT; +- VirtViewerApp *app = VIRT_VIEWER_APP(self); +- +- g_return_if_fail(session != NULL); +- +- g_value_init(&value, pspec->value_type); +- g_object_get_property(G_OBJECT(ctrl), pspec->name, &value); +- +- if (g_str_equal(pspec->name, "host") || +- g_str_equal(pspec->name, "port") || +- g_str_equal(pspec->name, "password") || +- g_str_equal(pspec->name, "ca-file") || +- g_str_equal(pspec->name, "enable-smartcard") || +- g_str_equal(pspec->name, "color-depth") || +- g_str_equal(pspec->name, "disable-effects") || +- g_str_equal(pspec->name, "enable-usbredir") || +- g_str_equal(pspec->name, "secure-channels") || +- g_str_equal(pspec->name, "proxy")) { +- g_object_set_property(G_OBJECT(session), pspec->name, &value); +- } else if (g_str_equal(pspec->name, "sport")) { +- g_object_set_property(G_OBJECT(session), "tls-port", &value); +- } else if (g_str_equal(pspec->name, "tls-ciphers")) { +- g_object_set_property(G_OBJECT(session), "ciphers", &value); +- } else if (g_str_equal(pspec->name, "host-subject")) { +- g_object_set_property(G_OBJECT(session), "cert-subject", &value); +- } else if (g_str_equal(pspec->name, "enable-usb-autoshare")) { +- VirtViewerSession *vsession = NULL; +- +- g_object_get(self, "session", &vsession, NULL); +- g_object_set_property(G_OBJECT(vsession), "auto-usbredir", &value); +- g_object_unref(G_OBJECT(vsession)); +- } else if (g_str_equal(pspec->name, "usb-filter")) { +- SpiceUsbDeviceManager *manager; +- manager = spice_usb_device_manager_get(session, NULL); +- if (manager != NULL) { +- g_object_set_property(G_OBJECT(manager), +- "auto-connect-filter", +- &value); +- } +- } else if (g_str_equal(pspec->name, "title")) { +- g_object_set(app, "title", g_value_get_string(&value), NULL); +- } else if (g_str_equal(pspec->name, "display-flags")) { +- guint flags = g_value_get_uint(&value); +- gboolean fullscreen = !!(flags & CONTROLLER_SET_FULL_SCREEN); +- g_object_set(G_OBJECT(self), "fullscreen", fullscreen, NULL); +- } else if (g_str_equal(pspec->name, "menu")) { +- spice_ctrl_menu_updated(self); +- } else if (g_str_equal(pspec->name, "hotkeys")) { +- virt_viewer_app_set_hotkeys(app, g_value_get_string(&value)); +- } else { +- gchar *content = g_strdup_value_contents(&value); +- +- g_debug("unimplemented property: %s=%s", pspec->name, content); +- g_free(content); +- } +- +- g_object_unref(session); +- g_value_unset(&value); +-} +- +-static void +-spice_ctrl_foreign_menu_notified(SpiceCtrlForeignMenu *ctrl_foreign_menu G_GNUC_UNUSED, +- GParamSpec *pspec, +- RemoteViewer *self) +-{ +- if (g_str_equal(pspec->name, "menu")) { +- spice_foreign_menu_updated(self); +- } +-} +- +-static void +-spice_ctrl_listen_async_cb(GObject *object, +- GAsyncResult *res, +- gpointer user_data) +-{ +- GError *error = NULL; +- VirtViewerApp *app = VIRT_VIEWER_APP(user_data); +- +- if (SPICE_CTRL_IS_CONTROLLER(object)) +- spice_ctrl_controller_listen_finish(SPICE_CTRL_CONTROLLER(object), res, &error); +- else if (SPICE_CTRL_IS_FOREIGN_MENU(object)) { +- spice_ctrl_foreign_menu_listen_finish(SPICE_CTRL_FOREIGN_MENU(object), res, &error); +- } else +- g_warn_if_reached(); +- +- if (error != NULL) { +- virt_viewer_app_simple_message_dialog(app, +- _("Controller connection failed: %s"), +- error->message); +- g_clear_error(&error); +- exit(EXIT_FAILURE); /* TODO: make start async? */ +- } +-} +- +- +-static gboolean +-remote_viewer_activate(VirtViewerApp *app, GError **error) +-{ +- RemoteViewer *self; +- gboolean ret = FALSE; +- +- g_return_val_if_fail(REMOTE_VIEWER_IS(app), FALSE); +- +- self = REMOTE_VIEWER(app); +- +- if (self->priv->controller) { +- SpiceSession *session = remote_viewer_get_spice_session(self); +- ret = spice_session_connect(session); +- g_object_unref(session); +- } else { +- ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->activate(app, error); +- } +- +- return ret; +-} +- +-static void +-remote_viewer_window_added(GtkApplication *app, +- GtkWindow *w) +-{ +- VirtViewerWindow *win = VIRT_VIEWER_WINDOW( +- g_object_get_data(G_OBJECT(w), "virt-viewer-window")); +- spice_menu_update(REMOTE_VIEWER(app), win); +- spice_foreign_menu_update(REMOTE_VIEWER(app), win); +- +- GTK_APPLICATION_CLASS(remote_viewer_parent_class)->window_added(app, w); +-} + #endif + + #ifdef HAVE_OVIRT +@@ -1094,29 +677,8 @@ remote_viewer_start(VirtViewerApp *app, GError **err) + gchar *type = NULL; + GError *error = NULL; + +-#ifdef HAVE_SPICE_GTK +- g_signal_connect(app, "notify", G_CALLBACK(app_notified), self); +- +- if (priv->controller) { +- if (!virt_viewer_app_create_session(app, "spice", &error)) { +- g_debug("Couldn't create a Spice session"); +- goto cleanup; +- } +- +- g_signal_connect(priv->controller, "notify", G_CALLBACK(spice_ctrl_notified), self); +- g_signal_connect(priv->controller, "do_connect", G_CALLBACK(spice_ctrl_do_connect), self); +- g_signal_connect(priv->controller, "show", G_CALLBACK(spice_ctrl_show), self); +- g_signal_connect(priv->controller, "hide", G_CALLBACK(spice_ctrl_hide), self); +- +- spice_ctrl_controller_listen(priv->controller, NULL, spice_ctrl_listen_async_cb, self); +- +- g_signal_connect(priv->ctrl_foreign_menu, "notify", G_CALLBACK(spice_ctrl_foreign_menu_notified), self); +- spice_ctrl_foreign_menu_listen(priv->ctrl_foreign_menu, NULL, spice_ctrl_listen_async_cb, self); +- +- virt_viewer_app_show_status(VIRT_VIEWER_APP(self), _("Setting up Spice session...")); +- } else { +-#endif + retry_dialog: ++ { + if (priv->open_recent_dialog) { + VirtViewerWindow *main_window = virt_viewer_app_get_main_window(app); + if (!remote_viewer_connect_dialog(virt_viewer_window_get_window(main_window), &guri)) { +@@ -1186,9 +748,7 @@ retry_dialog: + } + goto cleanup; + } +-#ifdef HAVE_SPICE_GTK + } +-#endif + + ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->start(app, &error); + +-- +2.17.1 + diff --git a/virt-viewer.spec b/virt-viewer.spec index 564dc77..c077b13 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -3,7 +3,7 @@ # 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:%define enable_autotools 0} +%{!?enable_autotools:%define enable_autotools 1} %define with_spice 0 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 @@ -17,12 +17,16 @@ Name: virt-viewer Version: 6.0 -Release: 4%{?dist}%{?extra_release} +Release: 5%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz + +# rhbz#1596215 - Rebuild virt-viewer with latest spice-glib +Patch0001: 0001-spice-controller-interface-is-being-removed-from-spi.patch + Requires: openssh-clients Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -43,7 +47,7 @@ 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 %if %{with_spice} -BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.33 +BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.35 BuildRequires: pkgconfig(spice-protocol) >= 0.12.7 %endif BuildRequires: /usr/bin/pod2man @@ -64,6 +68,7 @@ the display, and libvirt for looking up VNC/SPICE server details. %prep %setup -q +%patch0001 -p1 %build @@ -88,20 +93,8 @@ autoreconf -if %install rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p %{buildroot}%{_libexecdir} -touch %{buildroot}%{_libexecdir}/spice-xpi-client -install -m 0755 data/spice-xpi-client-remote-viewer %{buildroot}%{_libexecdir}/ %find_lang %{name} -%post -%{_sbindir}/update-alternatives --install %{_libexecdir}/spice-xpi-client \ - spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer 25 - -%postun -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove spice-xpi-client %{_libexecdir}/spice-xpi-client-remote-viewer -fi - %files -f %{name}.lang %defattr(-,root,root,-) %doc README.md COPYING AUTHORS ChangeLog NEWS @@ -112,12 +105,13 @@ fi %{_datadir}/applications/remote-viewer.desktop %{_datadir}/appdata/remote-viewer.appdata.xml %{_datadir}/mime/packages/virt-viewer-mime.xml -%ghost %{_libexecdir}/spice-xpi-client -%{_libexecdir}/spice-xpi-client-remote-viewer %{_mandir}/man1/virt-viewer.1* %{_mandir}/man1/remote-viewer.1* %changelog +* Thu Jun 28 2018 Fabiano Fidêncio <fidencio@fedoraproject.org> - 6.0-5 +- Add missing patch for spice-controller so being removed + * Thu Jun 28 2018 Daniel P. Berrangé <berrange@redhat.com> - 6.0-4 - Rebuild for spice-controller so being removed From 3a93f40c323216798afaf52a054827864c7f4715 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts <tibbs@math.uh.edu> Date: Tue, 10 Jul 2018 01:43:06 -0500 Subject: [PATCH 18/58] Remove needless use of %defattr --- virt-viewer.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index c077b13..f2b5ef4 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -96,7 +96,6 @@ rm -rf $RPM_BUILD_ROOT %find_lang %{name} %files -f %{name}.lang -%defattr(-,root,root,-) %doc README.md COPYING AUTHORS ChangeLog NEWS %{_bindir}/%{name} %{_bindir}/remote-viewer From e9fec986d5130058827571518648d32f37a73aef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 14 Jul 2018 08:35:16 +0000 Subject: [PATCH 19/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index f2b5ef4..2662b50 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 6.0 -Release: 5%{?dist}%{?extra_release} +Release: 6%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 28 2018 Fabiano Fidêncio <fidencio@fedoraproject.org> - 6.0-5 - Add missing patch for spice-controller so being removed From 9129ae61911f2e3a98e39acd70097e8303e78879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Fri, 27 Jul 2018 16:58:32 +0100 Subject: [PATCH 20/58] Update to 7.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ...-interface-is-being-removed-from-spi.patch | 676 ------------------ sources | 2 +- virt-viewer.spec | 15 +- 3 files changed, 8 insertions(+), 685 deletions(-) delete mode 100644 0001-spice-controller-interface-is-being-removed-from-spi.patch diff --git a/0001-spice-controller-interface-is-being-removed-from-spi.patch b/0001-spice-controller-interface-is-being-removed-from-spi.patch deleted file mode 100644 index 16c3bbb..0000000 --- a/0001-spice-controller-interface-is-being-removed-from-spi.patch +++ /dev/null @@ -1,676 +0,0 @@ -From 30c34a6cb642ed3d232db1ea8b14bfbb112c6f76 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@fedoraproject.org> -Date: Thu, 28 Jun 2018 20:34:40 +0200 -Subject: [PATCH] spice controller interface is being removed from spice-gtk. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> -Reviewed-by: Victor Toso <victortoso@redhat.com> -Signed-off-by: Fabiano Fidêncio <fidencio@fedoraprojet.org> ---- - configure.ac | 3 +- - data/Makefile.am | 1 - - data/spice-xpi-client-remote-viewer | 6 - - data/virt-viewer.wxs.in | 11 - - man/remote-viewer.pod | 6 - - src/Makefile.am | 2 - - src/remote-viewer.c | 448 +--------------------------- - 7 files changed, 5 insertions(+), 472 deletions(-) - delete mode 100644 data/spice-xpi-client-remote-viewer - -diff --git a/configure.ac b/configure.ac -index d5eb258..4f5e3df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -159,13 +159,12 @@ AC_ARG_WITH([spice-gtk], - AS_IF([test "x$with_spice_gtk" != "xno" && test "x$with_spice_gtk" != "xyes"], - [PKG_CHECK_EXISTS([spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED - spice-client-glib-2.0 >= $SPICE_GTK_REQUIRED -- spice-controller spice-protocol >= $SPICE_PROTOCOL_REQUIRED], -+ spice-protocol >= $SPICE_PROTOCOL_REQUIRED], - [with_spice_gtk=yes], [with_spice_gtk=no])]) - - AS_IF([test "x$with_spice_gtk" = "xyes"], - [PKG_CHECK_MODULES(SPICE_GTK, [spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED - spice-client-glib-2.0 >= $SPICE_GTK_REQUIRED])] -- [PKG_CHECK_MODULES(SPICE_CONTROLLER, [spice-controller])] - [PKG_CHECK_MODULES(SPICE_PROTOCOL, [spice-protocol >= $SPICE_PROTOCOL_REQUIRED])] - [AC_DEFINE([HAVE_SPICE_GTK], 1, [Have spice-gtk?])] - ) -diff --git a/data/Makefile.am b/data/Makefile.am -index 55718d9..54be2b1 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -3,7 +3,6 @@ CLEANFILES = - MANUFACTURER = Virt Manager Project - - EXTRA_DIST = \ -- spice-xpi-client-remote-viewer \ - virt-viewer.wxs.in \ - $(NULL) - -diff --git a/data/spice-xpi-client-remote-viewer b/data/spice-xpi-client-remote-viewer -deleted file mode 100644 -index 3109c66..0000000 ---- a/data/spice-xpi-client-remote-viewer -+++ /dev/null -@@ -1,6 +0,0 @@ --#!/bin/sh -- --logger -t spice "starting remote-viewer --spice-controller $@..." --env | logger -t spice --exec remote-viewer --spice-controller "$@" 2>&1 | logger -t spice --logger -t spice "remote-viewer execution failed" -diff --git a/data/virt-viewer.wxs.in b/data/virt-viewer.wxs.in -index 9838265..2047720 100644 ---- a/data/virt-viewer.wxs.in -+++ b/data/virt-viewer.wxs.in -@@ -55,16 +55,6 @@ - <Condition Message="VirtViewer is already installed.">NOT NEWERVERSIONDETECTED</Condition> - - <DirectoryRef Id="TARGETDIR"> -- <Component Id="CRegistryEntries" Guid="*"> -- <RegistryKey Root='HKLM' Key='Software\Microsoft\Internet Explorer\Low Rights\ElevationPolicy\{96190E9D-6FBB-64DB-9095-29F6FDE0B897}'> -- <RegistryValue Type='string' Name='AppPath' Value='[INSTALLDIR]\bin'/> -- <RegistryValue Type='string' Name='AppName' Value='remote-viewer.exe'/> -- <RegistryValue Type='integer' Name='Policy' Value='3'/> -- </RegistryKey> -- <RegistryKey Root='HKLM' Key='Software\spice-space.org\spicex'> -- <RegistryValue Type='string' Name='client' Value='[INSTALLDIR]\bin\remote-viewer.exe --spice-controller'/> -- </RegistryKey> -- </Component> - <Component Id="CProgIds" Guid="89D6F46D-9C5E-4D65-8456-58FC361E553E"> - <ProgId Id='VirtViewer.vvfile' Description='VirtViewer connection file'> - <Extension Id='vv' ContentType='application/x-virt-viewer'> -@@ -129,7 +119,6 @@ - <ComponentGroupRef Id="CG.virt-viewer"/> - <ComponentRef Id="CDepsFile"/> - <ComponentRef Id="CShortcut"/> -- <ComponentRef Id="CRegistryEntries"/> - <ComponentRef Id="CProgIds"/> - <ComponentRef Id="CHwdataUSB"/> - </Feature> -diff --git a/man/remote-viewer.pod b/man/remote-viewer.pod -index 60ea3a6..a050f4c 100644 ---- a/man/remote-viewer.pod -+++ b/man/remote-viewer.pod -@@ -55,12 +55,6 @@ CONFIGURATION section below. - - Set the window title to B<TITLE> - --=item --spice-controller -- --Use the SPICE controller to initialize the connection with the SPICE --server. This option is used by the SPICE browser addons to allow web --page to start a client. -- - =item --debug - - Print debugging information -diff --git a/src/Makefile.am b/src/Makefile.am -index e87bcc7..d17f4c1 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -178,11 +178,9 @@ remote_viewer_SOURCES = \ - $(NULL) - remote_viewer_LDFLAGS = \ - $(COMMON_LIBS) \ -- $(SPICE_CONTROLLER_LIBS) \ - $(NULL) - remote_viewer_CFLAGS = \ - $(COMMON_CFLAGS) \ -- $(SPICE_CONTROLLER_CFLAGS) \ - $(NULL) - remote_viewer_LDADD = \ - libvirt-viewer-util.la \ -diff --git a/src/remote-viewer.c b/src/remote-viewer.c -index b132214..e25208d 100644 ---- a/src/remote-viewer.c -+++ b/src/remote-viewer.c -@@ -36,7 +36,6 @@ - #endif - - #ifdef HAVE_SPICE_GTK --#include <spice-controller.h> - #include "virt-viewer-session-spice.h" - #endif - -@@ -49,10 +48,6 @@ - #include "remote-viewer-connect.h" - - struct _RemoteViewerPrivate { --#ifdef HAVE_SPICE_GTK -- SpiceCtrlController *controller; -- SpiceCtrlForeignMenu *ctrl_foreign_menu; --#endif - #ifdef HAVE_OVIRT - OvirtForeignMenu *ovirt_foreign_menu; - #endif -@@ -78,33 +73,15 @@ static OvirtVm * choose_vm(GtkWindow *main_window, - #endif - - static gboolean remote_viewer_start(VirtViewerApp *self, GError **error); --#ifdef HAVE_SPICE_GTK --static gboolean remote_viewer_activate(VirtViewerApp *self, GError **error); --static void remote_viewer_window_added(GtkApplication *app, GtkWindow *w); --static void spice_foreign_menu_updated(RemoteViewer *self); --static void foreign_menu_title_changed(SpiceCtrlForeignMenu *menu, GParamSpec *pspec, RemoteViewer *self); --#endif - - static void - remote_viewer_dispose (GObject *object) - { --#if defined(HAVE_SPICE_GTK) || defined(HAVE_OVIRT) -+#if defined(HAVE_OVIRT) - RemoteViewer *self = REMOTE_VIEWER(object); - RemoteViewerPrivate *priv = self->priv; - #endif - --#ifdef HAVE_SPICE_GTK -- if (priv->controller) { -- g_object_unref(priv->controller); -- priv->controller = NULL; -- } -- -- if (priv->ctrl_foreign_menu) { -- g_object_unref(priv->ctrl_foreign_menu); -- priv->ctrl_foreign_menu = NULL; -- } --#endif -- - #ifdef HAVE_OVIRT - if (priv->ovirt_foreign_menu) { - g_object_unref(priv->ovirt_foreign_menu); -@@ -132,7 +109,6 @@ remote_viewer_deactivated(VirtViewerApp *app, gboolean connect_error) - - static gchar **opt_args = NULL; - static char *opt_title = NULL; --static gboolean opt_controller = FALSE; - - static void - remote_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, GOptionGroup *group) -@@ -140,10 +116,6 @@ remote_viewer_add_option_entries(VirtViewerApp *self, GOptionContext *context, G - static const GOptionEntry options[] = { - { "title", 't', 0, G_OPTION_ARG_STRING, &opt_title, - N_("Set window title"), NULL }, --#ifdef HAVE_SPICE_GTK -- { "spice-controller", '\0', 0, G_OPTION_ARG_NONE, &opt_controller, -- N_("Open connection using Spice controller communication"), NULL }, --#endif - { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &opt_args, - NULL, "URI|VV-FILE" }, - { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } -@@ -184,27 +156,7 @@ remote_viewer_local_command_line (GApplication *gapp, - g_object_set(app, "guri", opt_args[0], NULL); - } - --#ifdef HAVE_SPICE_GTK -- if (opt_controller) { -- if (opt_args) { -- g_printerr(_("\nError: extra arguments given while using Spice controller\n\n")); -- ret = TRUE; -- *status = 1; -- goto end; -- } -- -- self->priv->controller = spice_ctrl_controller_new(); -- self->priv->ctrl_foreign_menu = spice_ctrl_foreign_menu_new(); -- -- g_object_set(self, "guest-name", "defined by Spice controller", NULL); -- -- g_signal_connect(self->priv->ctrl_foreign_menu, "notify::title", -- G_CALLBACK(foreign_menu_title_changed), -- self); -- } --#endif -- -- if (opt_title && !opt_controller) -+ if (opt_title) - g_object_set(app, "title", opt_title, NULL); - - end: -@@ -241,7 +193,6 @@ static void - remote_viewer_class_init (RemoteViewerClass *klass) - { - GObjectClass *object_class = G_OBJECT_CLASS (klass); -- GtkApplicationClass *gtk_app_class = GTK_APPLICATION_CLASS(klass); - VirtViewerAppClass *app_class = VIRT_VIEWER_APP_CLASS (klass); - GApplicationClass *g_app_class = G_APPLICATION_CLASS(klass); - -@@ -255,12 +206,6 @@ remote_viewer_class_init (RemoteViewerClass *klass) - app_class->start = remote_viewer_start; - app_class->deactivated = remote_viewer_deactivated; - app_class->add_option_entries = remote_viewer_add_option_entries; --#ifdef HAVE_SPICE_GTK -- app_class->activate = remote_viewer_activate; -- gtk_app_class->window_added = remote_viewer_window_added; --#else -- (void) gtk_app_class; --#endif - - #ifdef HAVE_OVIRT - g_object_class_install_property(object_class, -@@ -288,217 +233,7 @@ remote_viewer_new(void) - NULL); - } - --#ifdef HAVE_SPICE_GTK --static void --foreign_menu_title_changed(SpiceCtrlForeignMenu *menu G_GNUC_UNUSED, -- GParamSpec *pspec G_GNUC_UNUSED, -- RemoteViewer *self) --{ -- gboolean has_focus; -- -- g_object_get(G_OBJECT(self), "has-focus", &has_focus, NULL); -- /* FIXME: use a proper "new client connected" event -- ** a foreign menu client set the title when connecting, -- ** inform of focus state at that time. -- */ -- spice_ctrl_foreign_menu_app_activated_msg(self->priv->ctrl_foreign_menu, has_focus); -- -- /* update menu title */ -- spice_foreign_menu_updated(self); --} -- --static void --spice_ctrl_do_connect(SpiceCtrlController *ctrl G_GNUC_UNUSED, -- VirtViewerApp *self) --{ -- GError *error = NULL; -- -- if (!virt_viewer_app_initial_connect(self, &error)) { -- const gchar *msg = error ? error->message : -- _("Failed to initiate connection"); -- virt_viewer_app_simple_message_dialog(self, msg); -- g_clear_error(&error); -- } --} -- --static void --spice_ctrl_show(SpiceCtrlController *ctrl G_GNUC_UNUSED, RemoteViewer *self) --{ -- virt_viewer_app_show_display(VIRT_VIEWER_APP(self)); --} -- --static void --spice_ctrl_hide(SpiceCtrlController *ctrl G_GNUC_UNUSED, RemoteViewer *self) --{ -- virt_viewer_app_show_status(VIRT_VIEWER_APP(self), _("Display disabled by controller")); --} -- --static void --spice_menuitem_activate_cb(GtkMenuItem *mi, GObject *ctrl) --{ -- SpiceCtrlMenuItem *menuitem = g_object_get_data(G_OBJECT(mi), "spice-menuitem"); -- -- g_return_if_fail(menuitem != NULL); -- if (gtk_menu_item_get_submenu(mi)) -- return; -- -- if (SPICE_CTRL_IS_CONTROLLER(ctrl)) -- spice_ctrl_controller_menu_item_click_msg(SPICE_CTRL_CONTROLLER(ctrl), menuitem->id); -- else if (SPICE_CTRL_IS_FOREIGN_MENU(ctrl)) -- spice_ctrl_foreign_menu_menu_item_click_msg(SPICE_CTRL_FOREIGN_MENU(ctrl), menuitem->id); --} -- --static GtkWidget * --ctrlmenu_to_gtkmenu (RemoteViewer *self, SpiceCtrlMenu *ctrlmenu, GObject *ctrl) --{ -- GList *l; -- GtkWidget *menu = gtk_menu_new(); -- guint n = 0; -- -- for (l = ctrlmenu->items; l != NULL; l = l->next) { -- SpiceCtrlMenuItem *menuitem = l->data; -- GtkWidget *item; -- char *s; -- if (menuitem->text == NULL) { -- g_warn_if_reached(); -- continue; -- } -- -- for (s = menuitem->text; *s; s++) -- if (*s == '&') -- *s = '_'; -- -- if (g_str_equal(menuitem->text, "-")) { -- item = gtk_separator_menu_item_new(); -- } else if (menuitem->flags & CONTROLLER_MENU_FLAGS_CHECKED) { -- item = gtk_check_menu_item_new_with_mnemonic(menuitem->text); -- g_object_set(item, "active", TRUE, NULL); -- } else { -- item = gtk_menu_item_new_with_mnemonic(menuitem->text); -- } -- -- if (menuitem->flags & (CONTROLLER_MENU_FLAGS_GRAYED | CONTROLLER_MENU_FLAGS_DISABLED)) -- gtk_widget_set_sensitive(item, FALSE); -- -- g_object_set_data_full(G_OBJECT(item), "spice-menuitem", -- g_object_ref(menuitem), g_object_unref); -- g_signal_connect(item, "activate", G_CALLBACK(spice_menuitem_activate_cb), ctrl); -- gtk_menu_attach(GTK_MENU (menu), item, 0, 1, n, n + 1); -- n += 1; -- -- if (menuitem->submenu) { -- gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), -- ctrlmenu_to_gtkmenu(self, menuitem->submenu, ctrl)); -- } -- } -- -- if (n == 0) { -- g_object_ref_sink(menu); -- g_object_unref(menu); -- menu = NULL; -- } -- -- gtk_widget_show_all(menu); -- return menu; --} -- --static void --spice_menu_update(RemoteViewer *self, VirtViewerWindow *win) --{ -- GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "spice-menu"); -- SpiceCtrlMenu *menu; -- -- if (self->priv->controller == NULL) -- return; -- -- if (menuitem != NULL) -- gtk_widget_destroy(menuitem); -- -- { -- GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu")); -- menuitem = gtk_menu_item_new_with_label("Spice"); -- gtk_menu_shell_append(shell, menuitem); -- g_object_set_data(G_OBJECT(win), "spice-menu", menuitem); -- } -- -- g_object_get(self->priv->controller, "menu", &menu, NULL); -- if (menu == NULL || g_list_length(menu->items) == 0) { -- gtk_widget_set_visible(menuitem, FALSE); -- } else { -- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), -- ctrlmenu_to_gtkmenu(self, menu, G_OBJECT(self->priv->controller))); -- gtk_widget_set_visible(menuitem, TRUE); -- } -- -- if (menu != NULL) -- g_object_unref(menu); --} -- --static void --spice_menu_update_each(gpointer value, -- gpointer user_data) --{ -- spice_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value)); --} -- --static void --spice_ctrl_menu_updated(RemoteViewer *self) --{ -- GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); -- -- g_debug("Spice controller menu updated"); -- -- g_list_foreach(windows, spice_menu_update_each, self); --} -- --static void --spice_foreign_menu_update(RemoteViewer *self, VirtViewerWindow *win) --{ -- GtkWidget *menuitem = g_object_get_data(G_OBJECT(win), "foreign-menu"); -- SpiceCtrlMenu *menu; -- -- if (self->priv->ctrl_foreign_menu == NULL) -- return; -- -- if (menuitem != NULL) -- gtk_widget_destroy(menuitem); -- -- { -- GtkMenuShell *shell = GTK_MENU_SHELL(gtk_builder_get_object(virt_viewer_window_get_builder(win), "top-menu")); -- const gchar *title = spice_ctrl_foreign_menu_get_title(self->priv->ctrl_foreign_menu); -- menuitem = gtk_menu_item_new_with_label(title); -- gtk_menu_shell_append(shell, menuitem); -- g_object_set_data(G_OBJECT(win), "foreign-menu", menuitem); -- } -- -- g_object_get(self->priv->ctrl_foreign_menu, "menu", &menu, NULL); -- if (menu == NULL || g_list_length(menu->items) == 0) { -- gtk_widget_set_visible(menuitem, FALSE); -- } else { -- gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), -- ctrlmenu_to_gtkmenu(self, menu, G_OBJECT(self->priv->ctrl_foreign_menu))); -- gtk_widget_set_visible(menuitem, TRUE); -- } -- g_object_unref(menu); --} -- --static void --spice_foreign_menu_update_each(gpointer value, -- gpointer user_data) --{ -- spice_foreign_menu_update(REMOTE_VIEWER(user_data), VIRT_VIEWER_WINDOW(value)); --} -- --static void --spice_foreign_menu_updated(RemoteViewer *self) --{ -- GList *windows = virt_viewer_app_get_windows(VIRT_VIEWER_APP(self)); -- -- g_debug("Spice foreign menu updated"); -- -- g_list_foreach(windows, spice_foreign_menu_update_each, self); --} -- -+#if defined(HAVE_SPICE_GTK) && defined(HAVE_OVIRT) - static SpiceSession * - remote_viewer_get_spice_session(RemoteViewer *self) - { -@@ -514,158 +249,6 @@ remote_viewer_get_spice_session(RemoteViewer *self) - - return session; - } -- --static void --app_notified(VirtViewerApp *app, -- GParamSpec *pspec, -- RemoteViewer *self) --{ -- GValue value = G_VALUE_INIT; -- -- g_value_init(&value, pspec->value_type); -- g_object_get_property(G_OBJECT(app), pspec->name, &value); -- -- if (g_str_equal(pspec->name, "has-focus")) { -- if (self->priv->ctrl_foreign_menu) -- spice_ctrl_foreign_menu_app_activated_msg(self->priv->ctrl_foreign_menu, g_value_get_boolean(&value)); -- } -- -- g_value_unset(&value); --} -- --static void --spice_ctrl_notified(SpiceCtrlController *ctrl, -- GParamSpec *pspec, -- RemoteViewer *self) --{ -- SpiceSession *session = remote_viewer_get_spice_session(self); -- GValue value = G_VALUE_INIT; -- VirtViewerApp *app = VIRT_VIEWER_APP(self); -- -- g_return_if_fail(session != NULL); -- -- g_value_init(&value, pspec->value_type); -- g_object_get_property(G_OBJECT(ctrl), pspec->name, &value); -- -- if (g_str_equal(pspec->name, "host") || -- g_str_equal(pspec->name, "port") || -- g_str_equal(pspec->name, "password") || -- g_str_equal(pspec->name, "ca-file") || -- g_str_equal(pspec->name, "enable-smartcard") || -- g_str_equal(pspec->name, "color-depth") || -- g_str_equal(pspec->name, "disable-effects") || -- g_str_equal(pspec->name, "enable-usbredir") || -- g_str_equal(pspec->name, "secure-channels") || -- g_str_equal(pspec->name, "proxy")) { -- g_object_set_property(G_OBJECT(session), pspec->name, &value); -- } else if (g_str_equal(pspec->name, "sport")) { -- g_object_set_property(G_OBJECT(session), "tls-port", &value); -- } else if (g_str_equal(pspec->name, "tls-ciphers")) { -- g_object_set_property(G_OBJECT(session), "ciphers", &value); -- } else if (g_str_equal(pspec->name, "host-subject")) { -- g_object_set_property(G_OBJECT(session), "cert-subject", &value); -- } else if (g_str_equal(pspec->name, "enable-usb-autoshare")) { -- VirtViewerSession *vsession = NULL; -- -- g_object_get(self, "session", &vsession, NULL); -- g_object_set_property(G_OBJECT(vsession), "auto-usbredir", &value); -- g_object_unref(G_OBJECT(vsession)); -- } else if (g_str_equal(pspec->name, "usb-filter")) { -- SpiceUsbDeviceManager *manager; -- manager = spice_usb_device_manager_get(session, NULL); -- if (manager != NULL) { -- g_object_set_property(G_OBJECT(manager), -- "auto-connect-filter", -- &value); -- } -- } else if (g_str_equal(pspec->name, "title")) { -- g_object_set(app, "title", g_value_get_string(&value), NULL); -- } else if (g_str_equal(pspec->name, "display-flags")) { -- guint flags = g_value_get_uint(&value); -- gboolean fullscreen = !!(flags & CONTROLLER_SET_FULL_SCREEN); -- g_object_set(G_OBJECT(self), "fullscreen", fullscreen, NULL); -- } else if (g_str_equal(pspec->name, "menu")) { -- spice_ctrl_menu_updated(self); -- } else if (g_str_equal(pspec->name, "hotkeys")) { -- virt_viewer_app_set_hotkeys(app, g_value_get_string(&value)); -- } else { -- gchar *content = g_strdup_value_contents(&value); -- -- g_debug("unimplemented property: %s=%s", pspec->name, content); -- g_free(content); -- } -- -- g_object_unref(session); -- g_value_unset(&value); --} -- --static void --spice_ctrl_foreign_menu_notified(SpiceCtrlForeignMenu *ctrl_foreign_menu G_GNUC_UNUSED, -- GParamSpec *pspec, -- RemoteViewer *self) --{ -- if (g_str_equal(pspec->name, "menu")) { -- spice_foreign_menu_updated(self); -- } --} -- --static void --spice_ctrl_listen_async_cb(GObject *object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GError *error = NULL; -- VirtViewerApp *app = VIRT_VIEWER_APP(user_data); -- -- if (SPICE_CTRL_IS_CONTROLLER(object)) -- spice_ctrl_controller_listen_finish(SPICE_CTRL_CONTROLLER(object), res, &error); -- else if (SPICE_CTRL_IS_FOREIGN_MENU(object)) { -- spice_ctrl_foreign_menu_listen_finish(SPICE_CTRL_FOREIGN_MENU(object), res, &error); -- } else -- g_warn_if_reached(); -- -- if (error != NULL) { -- virt_viewer_app_simple_message_dialog(app, -- _("Controller connection failed: %s"), -- error->message); -- g_clear_error(&error); -- exit(EXIT_FAILURE); /* TODO: make start async? */ -- } --} -- -- --static gboolean --remote_viewer_activate(VirtViewerApp *app, GError **error) --{ -- RemoteViewer *self; -- gboolean ret = FALSE; -- -- g_return_val_if_fail(REMOTE_VIEWER_IS(app), FALSE); -- -- self = REMOTE_VIEWER(app); -- -- if (self->priv->controller) { -- SpiceSession *session = remote_viewer_get_spice_session(self); -- ret = spice_session_connect(session); -- g_object_unref(session); -- } else { -- ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->activate(app, error); -- } -- -- return ret; --} -- --static void --remote_viewer_window_added(GtkApplication *app, -- GtkWindow *w) --{ -- VirtViewerWindow *win = VIRT_VIEWER_WINDOW( -- g_object_get_data(G_OBJECT(w), "virt-viewer-window")); -- spice_menu_update(REMOTE_VIEWER(app), win); -- spice_foreign_menu_update(REMOTE_VIEWER(app), win); -- -- GTK_APPLICATION_CLASS(remote_viewer_parent_class)->window_added(app, w); --} - #endif - - #ifdef HAVE_OVIRT -@@ -1094,29 +677,8 @@ remote_viewer_start(VirtViewerApp *app, GError **err) - gchar *type = NULL; - GError *error = NULL; - --#ifdef HAVE_SPICE_GTK -- g_signal_connect(app, "notify", G_CALLBACK(app_notified), self); -- -- if (priv->controller) { -- if (!virt_viewer_app_create_session(app, "spice", &error)) { -- g_debug("Couldn't create a Spice session"); -- goto cleanup; -- } -- -- g_signal_connect(priv->controller, "notify", G_CALLBACK(spice_ctrl_notified), self); -- g_signal_connect(priv->controller, "do_connect", G_CALLBACK(spice_ctrl_do_connect), self); -- g_signal_connect(priv->controller, "show", G_CALLBACK(spice_ctrl_show), self); -- g_signal_connect(priv->controller, "hide", G_CALLBACK(spice_ctrl_hide), self); -- -- spice_ctrl_controller_listen(priv->controller, NULL, spice_ctrl_listen_async_cb, self); -- -- g_signal_connect(priv->ctrl_foreign_menu, "notify", G_CALLBACK(spice_ctrl_foreign_menu_notified), self); -- spice_ctrl_foreign_menu_listen(priv->ctrl_foreign_menu, NULL, spice_ctrl_listen_async_cb, self); -- -- virt_viewer_app_show_status(VIRT_VIEWER_APP(self), _("Setting up Spice session...")); -- } else { --#endif - retry_dialog: -+ { - if (priv->open_recent_dialog) { - VirtViewerWindow *main_window = virt_viewer_app_get_main_window(app); - if (!remote_viewer_connect_dialog(virt_viewer_window_get_window(main_window), &guri)) { -@@ -1186,9 +748,7 @@ retry_dialog: - } - goto cleanup; - } --#ifdef HAVE_SPICE_GTK - } --#endif - - ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->start(app, &error); - --- -2.17.1 - diff --git a/sources b/sources index 437dbef..8cf6beb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virt-viewer-6.0.tar.gz) = 656d48f8ab387d025c406cb5f56164d79104c6c377fae37d9c524b90e512fe873d5d1d6c435d4ea95e71468b7d3384b89789495075cafb1a9e67f583f7d49ec2 +SHA512 (virt-viewer-7.0.tar.gz) = e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904 diff --git a/virt-viewer.spec b/virt-viewer.spec index 2662b50..c264c3a 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -3,7 +3,7 @@ # 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:%define enable_autotools 1} +%{!?enable_autotools:%global enable_autotools 0} %define with_spice 0 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 @@ -16,17 +16,14 @@ %endif Name: virt-viewer -Version: 6.0 -Release: 6%{?dist}%{?extra_release} +Version: 7.0 +Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz -# rhbz#1596215 - Rebuild virt-viewer with latest spice-glib -Patch0001: 0001-spice-controller-interface-is-being-removed-from-spi.patch - Requires: openssh-clients Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -68,7 +65,6 @@ the display, and libvirt for looking up VNC/SPICE server details. %prep %setup -q -%patch0001 -p1 %build @@ -86,7 +82,7 @@ autoreconf -if %define govirt_arg --with-ovirt %endif -%configure %{spice_arg} %{gtk_arg} %{govirt_arg} --with-buildid=%{release} --disable-update-mimedb +%configure %{spice_arg} %{govirt_arg} --with-buildid=%{release} --disable-update-mimedb %__make %{?_smp_mflags} @@ -108,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Fri Jul 27 2018 Daniel P. Berrangé <berrange@redhat.com> - 7.0-1 +- Update to 7.0 release + * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 22400e49539abcc24c80ffcc9a7419416d09312b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Fri, 27 Jul 2018 17:07:55 +0100 Subject: [PATCH 21/58] Add GCC to BR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- virt-viewer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/virt-viewer.spec b/virt-viewer.spec index c264c3a..a5f272b 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -37,6 +37,7 @@ BuildRequires: gettext-devel BuildRequires: libtool %endif +BuildRequires: gcc BuildRequires: pkgconfig(glib-2.0) >= 2.38 BuildRequires: pkgconfig(gtk+-3.0) >= 3.12 BuildRequires: pkgconfig(libvirt) >= 0.10.0 From 05b78705b94be2f5a2cdfa551b9ce64e632cf397 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko <ignatenkobrain@fedoraproject.org> Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 22/58] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- virt-viewer.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index a5f272b..8092e8b 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -19,7 +19,6 @@ Name: virt-viewer Version: 7.0 Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer -Group: Applications/System License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz From ca0e90aaee2917dcff80b502a86abf09148e68b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sun, 3 Feb 2019 11:21:04 +0000 Subject: [PATCH 23/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 8092e8b..5b5e895 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 7.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: Virtual Machine Viewer License: GPLv2+ URL: http://virt-manager.org/ @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 27 2018 Daniel P. Berrangé <berrange@redhat.com> - 7.0-1 - Update to 7.0 release From 7b5c3f9767f4aebe82c940fb45fd93c4b51262df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Fri, 29 Mar 2019 15:18:04 +0000 Subject: [PATCH 24/58] Update to 8.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- sources | 2 +- virt-viewer.spec | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 8cf6beb..d4beefb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virt-viewer-7.0.tar.gz) = e0558c9138877f546add6a3df9721e100cadb6953815be82b2376b0521b82cf14052bdc29c42bb03b198b6e9d129a55d33531a153207d7f29b5c1c3402ebc904 +SHA512 (virt-viewer-8.0.tar.gz) = 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918 diff --git a/virt-viewer.spec b/virt-viewer.spec index 5b5e895..c555c86 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -16,13 +16,12 @@ %endif Name: virt-viewer -Version: 7.0 -Release: 2%{?dist}%{?extra_release} +Version: 8.0 +Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer License: GPLv2+ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz - Requires: openssh-clients Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -37,7 +36,7 @@ BuildRequires: libtool %endif BuildRequires: gcc -BuildRequires: pkgconfig(glib-2.0) >= 2.38 +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 @@ -50,7 +49,7 @@ BuildRequires: pkgconfig(spice-protocol) >= 0.12.7 BuildRequires: /usr/bin/pod2man BuildRequires: intltool %if %{with_govirt} -BuildRequires: pkgconfig(govirt-1.0) >= 0.3.2 +BuildRequires: pkgconfig(govirt-1.0) >= 0.3.3 %endif %if 0%{?fedora} >= 20 @@ -91,6 +90,7 @@ rm -rf $RPM_BUILD_ROOT %__make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} + %files -f %{name}.lang %doc README.md COPYING AUTHORS ChangeLog NEWS %{_bindir}/%{name} @@ -104,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Fri Mar 29 2019 Daniel P. Berrangé <berrange@redhat.com> - 8.0-1 +- Update to 8.0 release + * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 503def1f6f67626a586e37d86a346ea79a44b97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> Date: Thu, 11 Apr 2019 14:18:07 +0200 Subject: [PATCH 25/58] Compile with VTE support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- virt-viewer.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index c555c86..1a965ec 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 8.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: Virtual Machine Viewer License: GPLv2+ URL: http://virt-manager.org/ @@ -42,6 +42,7 @@ 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: pkgconfig(vte-2.91) %if %{with_spice} BuildRequires: pkgconfig(spice-client-gtk-3.0) >= 0.35 BuildRequires: pkgconfig(spice-protocol) >= 0.12.7 @@ -81,7 +82,7 @@ autoreconf -if %define govirt_arg --with-ovirt %endif -%configure %{spice_arg} %{govirt_arg} --with-buildid=%{release} --disable-update-mimedb +%configure %{spice_arg} %{govirt_arg} --with-vte --with-buildid=%{release} --disable-update-mimedb %__make %{?_smp_mflags} @@ -104,6 +105,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Thu Apr 11 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 8.0-2 +- Compile with VTE support + + * Fri Mar 29 2019 Daniel P. Berrangé <berrange@redhat.com> - 8.0-1 - Update to 8.0 release From 3f731acc97ec8ec0dccf8f3a329ba7955da0ef6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com> Date: Thu, 11 Apr 2019 14:37:07 +0200 Subject: [PATCH 26/58] Extra line in changelog --- virt-viewer.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 1a965ec..62fe706 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -108,7 +108,6 @@ rm -rf $RPM_BUILD_ROOT * Thu Apr 11 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 8.0-2 - Compile with VTE support - * Fri Mar 29 2019 Daniel P. Berrangé <berrange@redhat.com> - 8.0-1 - Update to 8.0 release From 2f71e819688ba8fc719260b48bbbb6e057075f55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 27 Jul 2019 03:03:45 +0000 Subject: [PATCH 27/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 62fe706..960f5c0 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 8.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: Virtual Machine Viewer License: GPLv2+ URL: http://virt-manager.org/ @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Apr 11 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 8.0-2 - Compile with VTE support From 40495a1d7232e7438fdd513079543ccf36c5745e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Fri, 31 Jan 2020 03:15:37 +0000 Subject: [PATCH 28/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 960f5c0..8016aa5 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 8.0 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} Summary: Virtual Machine Viewer License: GPLv2+ URL: http://virt-manager.org/ @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e75a9bf32c7c4421d63c6d3ccf48b25629fe888b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Fri, 1 May 2020 18:25:01 +0100 Subject: [PATCH 29/58] Update to 9.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- sources | 2 +- virt-viewer.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index d4beefb..18ea4ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virt-viewer-8.0.tar.gz) = 73317048949b6c49c28aab4685e3fb6533945b12c47078b522429b3e178423fcec5758c970d5048c8f65fee2b92a629b7e067cffa79c968292c73fd36133b918 +SHA512 (virt-viewer-9.0.tar.gz) = a5901d76c3e144fa3d6e640de93ed7f1e7cbeb075c04cdbe4a8c9c09bce96104ea552484df5e84c7a69af8dddd1177123ddb81b2dac775a98ac312f3102daae2 diff --git a/virt-viewer.spec b/virt-viewer.spec index 8016aa5..f40b335 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -16,8 +16,8 @@ %endif Name: virt-viewer -Version: 8.0 -Release: 4%{?dist}%{?extra_release} +Version: 9.0 +Release: 1%{?dist}%{?extra_release} Summary: Virtual Machine Viewer License: GPLv2+ URL: http://virt-manager.org/ @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Fri May 1 2020 Daniel P. Berrangé <berrange@redhat.com> - 9.0-1 +- Update to 9.0 release + * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 4e3e196a13c0a42d253705e1a332390bca783adc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Wed, 29 Jul 2020 13:47:34 +0000 Subject: [PATCH 30/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index f40b335..df9418e 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 9.0 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: Virtual Machine Viewer License: GPLv2+ URL: http://virt-manager.org/ @@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri May 1 2020 Daniel P. Berrangé <berrange@redhat.com> - 9.0-1 - Update to 9.0 release From f20a22bccbda39d722c5f2c893a61f81c9fe9e5b Mon Sep 17 00:00:00 2001 From: Tom Stellard <tstellar@redhat.com> Date: Tue, 12 Jan 2021 01:37:22 +0000 Subject: [PATCH 31/58] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- virt-viewer.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/virt-viewer.spec b/virt-viewer.spec index df9418e..05fd2ce 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -35,6 +35,7 @@ BuildRequires: gettext-devel BuildRequires: libtool %endif +BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(gtk+-3.0) >= 3.12 From 2fc527c8883471550fca20b84b774c2a4ba4a080 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Wed, 27 Jan 2021 23:09:15 +0000 Subject: [PATCH 32/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 05fd2ce..0a9e4f4 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,7 +17,7 @@ Name: virt-viewer Version: 9.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: Virtual Machine Viewer License: GPLv2+ URL: http://virt-manager.org/ @@ -106,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/remote-viewer.1* %changelog +* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1d74eb4bf54a4540f98477afd4c2add33589937f 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:00:35 +0100 Subject: [PATCH 33/58] Trim changelog entries prior to 2020 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- virt-viewer.spec | 216 ----------------------------------------------- 1 file changed, 216 deletions(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 0a9e4f4..59144cf 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -117,219 +117,3 @@ rm -rf $RPM_BUILD_ROOT * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Apr 11 2019 Marc-André Lureau <marcandre.lureau@redhat.com> - 8.0-2 -- Compile with VTE support - -* Fri Mar 29 2019 Daniel P. Berrangé <berrange@redhat.com> - 8.0-1 -- Update to 8.0 release - -* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 27 2018 Daniel P. Berrangé <berrange@redhat.com> - 7.0-1 -- Update to 7.0 release - -* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jun 28 2018 Fabiano Fidêncio <fidencio@fedoraproject.org> - 6.0-5 -- Add missing patch for spice-controller so being removed - -* Thu Jun 28 2018 Daniel P. Berrangé <berrange@redhat.com> - 6.0-4 -- Rebuild for spice-controller so being removed - -* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 6.0-2 -- Remove obsolete scriptlets - -* Tue Aug 15 2017 Daniel P. Berrange <berrange@redhat.com> - 6.0-1 -- Update to 6.0 release - -* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Nov 24 2016 Daniel P. Berrange <berrange@redhat.com> - 5.0-1 -- Update to 5.0 release - -* Wed Oct 05 2016 Christophe Fergeau <cfergeau@redhat.com> 4.0-2 -- Add upstream patch fixing virt-viewer window gradually getting bigger and - bigger - -* Thu Jun 30 2016 Daniel P. Berrange <berrange@redhat.com> - 4.0-1 -- Update to 4.0 release - -* Wed Jun 22 2016 Christophe Fergeau <cfergeau@redhat.com> - 3.0-3 -- Rebuild for spice-gtk ABI break - -* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Dec 4 2015 Fabiano Fidêncio <fidencio@redhat.com> - 3.0-1 -- Update to 3.0 release - -* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Jan 12 2015 Daniel P. Berrange <berrange@redhat.com> - 2.0-1 -- Update to 2.0 release - -* Sat Sep 27 2014 Rex Dieter <rdieter@fedoraproject.org> - 1.0-3 -- update/optimize mime scriptlets - -* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Jul 21 2014 Daniel P. Berrange <berrange@redhat.com> - 1.0-1 -- Update to 1.0 release - -* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Feb 26 2014 Christophe Fergeau <cfergeau@redhat.com> 0.6.0-1 -- Update to 0.6.0 release - -* Tue Nov 26 2013 Christophe Fergeau <cfergeau@redhat.com> 0.5.7-2 -- Rebuild for new libgovirt - -* Wed Jul 31 2013 Daniel P. Berrange <berrange@redhat.com> - 0.5.7-1 -- Update to 0.5.7 release - -* Thu May 23 2013 Christophe Fergeau <cfergeau@redhat.com> - 0.5.6-2 -- Mark remote-viewer as replacing spice-client - -* Wed May 1 2013 Daniel P. Berrange <berrange@redhat.com> - 0.5.6-1 -- Update to 0.5.6 release - -* Wed Feb 13 2013 Daniel P. Berrange <berrange@redhat.com> - 0.5.5-1 -- Update to 0.5.5 release - -* Fri Dec 14 2012 Cole Robinson <crobinso@redhat.com> - 0.5.4-3 -- Fix crash after entering spice password (bz #880381) - -* Sat Oct 13 2012 Chris Tyler <chris@tylers.info> - 0.5.4-2 -- Enabled spice support for ARM archs - -* Mon Sep 17 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.4-1 -- Update to 0.5.4 release - -* Fri Sep 14 2012 Hans de Goede <hdegoede@redhat.com> - 0.5.3-6 -- Rebuild for spice-gtk ABI breakage (previous spice-gtk build was borked) - -* Tue Sep 11 2012 Hans de Goede <hdegoede@redhat.com> - 0.5.3-5 -- Rebuild for spice-gtk ABI breakage - -* Fri Sep 7 2012 Hans de Goede <hdegoede@redhat.com> - 0.5.3-4 -- Rebuild for spice-gtk soname change - -* Mon Aug 13 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.3-3 -- Rebuild for spice-gtk soname change - -* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed May 16 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.3-1 -- Update to 0.5.3 release - -* Fri Mar 9 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.2-1 -- Update to 0.5.2 release - -* Fri Feb 17 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.1-1 -- Update to 0.5.1 release - -* Tue Feb 14 2012 Daniel P. Berrange <berrange@redhat.com> - 0.5.0-1 -- Update to 0.5.0 release - -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 9 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.2-1 -- Update to 0.4.2 release - -* Sun Aug 14 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-3 -- More ssh tunnelling port fixes - -* Fri Aug 12 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-2 -- Fix ssh tunnelling - -* Thu Aug 4 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.1-1 -- Update to 0.4.1 release - -* Tue Aug 2 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-2 -- Rebuild for accidental spice-glib soname change - -* Tue Jul 12 2011 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-1 -- Update to 0.4.0 release -- Switch build to GTK3 instead of GTK2 - -* Tue May 31 2011 Daniel P. Berrange <berrange@redhat.com> - 0.3.1-2 -- Rebuild for spice-glib ABI breakage - -* Wed May 11 2011 Karsten Hopp <karsten@redhat.com> 0.3.1-1.1 -- spice-gtk is x86 x86_64 only, don't require it on other archs - -* Mon Feb 21 2011 Daniel P. Berrange <berrange@redhat.com> - 0.3.1-1 -- Update to 0.3.1 release - -* Mon Feb 21 2011 Daniel P. Berrange <berrange@redhat.com> - 0.3.0-1 -- Update to 0.3.0 and enable SPICE - -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jan 15 2010 Daniel P. Berrange <berrange@redhat.com> - 0.2.1-1 -- Update to 0.2.1 release - -* Wed Jul 29 2009 Daniel P. Berrange <berrange@redhat.com> - 0.2.0-1.fc12 -- Update to 0.2.0 release - -* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu May 7 2009 Daniel P. Berrange <berrange@redhat.com> - 0.0.3-5.fc12 -- Fix auth against libvirt (rhbz #499594) -- Fix confusion of VNC credentials (rhbz #499595) -- Correct keyboard grab handling (rhbz #499362) - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Jul 7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.0.3-3.fc10 -- fix conditional comparison -- remove file dep - -* Wed Jun 25 2008 Daniel P. Berrange <berrange@redhat.com> - 0.0.3-2.fc10 -- Rebuild for GNU TLS ABI bump - -* Mon Mar 10 2008 Daniel P. Berrange <berrange@redhat.com> - 0.0.3-1.fc9 -- Updated to 0.0.3 release - -* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.0.2-4 -- Autorebuild for GCC 4.3 - -* Fri Jan 11 2008 Daniel P. Berrange <berrange@redhat.com> - 0.0.2-3.fc9 -- Set domain name as window title -- Hide input for passwd fields during auth - -* Mon Oct 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.0.2-2.fc8 -- Change TLS x509 credential name to sync with libvirt - -* Tue Aug 28 2007 Daniel P. Berrange <berrange@redhat.com> - 0.0.2-1.fc8 -- Added support for remote console access - -* Fri Aug 17 2007 Daniel P. Berrange <berrange@redhat.com> - 0.0.1-2.fc8 -- Restrict built to x86 & ia64 because libvirt is only on those arches - -* Wed Aug 15 2007 Daniel P. Berrange <berrange@redhat.com> - 0.0.1-1.fc8 -- First release From 73f66ac1dd9e2740dc82cbc8b9642f71a3d7d0e3 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:01:39 +0100 Subject: [PATCH 34/58] Rebase to 10.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- .gitignore | 2 +- sources | 2 +- virt-viewer.spec | 98 ++++++++++++++++-------------------------------- 3 files changed, 34 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 59144cf..dd4cb72 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: 3%{?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,30 @@ 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 +* Tue Apr 20 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-1 +- Update to 10.0 release + * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 99a90f225038bc93aab81a972f59a00c1782032a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Mon, 26 Apr 2021 10:51:02 +0100 Subject: [PATCH 35/58] Explicitly disable spice/ovirt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- virt-viewer.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index dd4cb72..09be791 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -10,7 +10,7 @@ Name: virt-viewer Version: 10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Machine Viewer License: GPLv2+ URL: https://gitlab.com/virt-viewer/virt-viewer @@ -48,7 +48,15 @@ the display, and libvirt for looking up VNC/SPICE server details. %setup -q %build -%meson -Dbuild-id=%{release} +%if !%{with_govirt} +%define ovirt_opt -Dovirt=disabled +%endif + +%if !%{with_spice} +%define spice_opt -Dspice=disabled +%endif + +%meson -Dbuild-id=%{release} %{?ovirt_opt} %{?spice_opt} %meson_build %install @@ -69,6 +77,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Mon Apr 26 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-2 +- Explicitly disable spice/ovirt + * Tue Apr 20 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-1 - Update to 10.0 release From 2a56738b1f8c7cdedf39846696bc1fc76c23befe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Fri, 23 Jul 2021 20:33:52 +0000 Subject: [PATCH 36/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 09be791..9885675 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -10,7 +10,7 @@ Name: virt-viewer Version: 10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Machine Viewer License: GPLv2+ URL: https://gitlab.com/virt-viewer/virt-viewer @@ -77,6 +77,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Apr 26 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-2 - Explicitly disable spice/ovirt From f26539089727fe664cf94354492fc0654497f964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Wed, 11 Aug 2021 11:05:31 +0100 Subject: [PATCH 37/58] Fix build with newer glib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ...nings-from-use-of-G_GNUC_FALLTHROUGH.patch | 72 +++++++++++++++++++ virt-viewer.spec | 8 ++- 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch diff --git a/0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch b/0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch new file mode 100644 index 0000000..8494406 --- /dev/null +++ b/0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch @@ -0,0 +1,72 @@ +From 2e6adf9b85cee3b85a9f7da8d976f3dd022afaa3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> +Date: Tue, 27 Jul 2021 16:25:12 +0100 +Subject: [PATCH] src: avoid warnings from use of G_GNUC_FALLTHROUGH +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since glib >= 2.69 we get warnings: + +../src/ovirt-foreign-menu.c: In function 'ovirt_foreign_menu_next_async_step': +../src/ovirt-foreign-menu.c:319:13: error: Not available before 2.60 [-Werror] + 319 | G_GNUC_FALLTHROUGH; + | ^~~~~~~~~~~~~~~ +../src/ovirt-foreign-menu.c:345:13: error: Not available before 2.60 [-Werror] + 345 | G_GNUC_FALLTHROUGH; + | ^~~~~~~~~~~~~~~ +../src/ovirt-foreign-menu.c:351:13: error: Not available before 2.60 [-Werror] + 351 | G_GNUC_FALLTHROUGH; + | ^~~~~~~~~~~~~~~ +../src/ovirt-foreign-menu.c:357:13: error: Not available before 2.60 [-Werror] + 357 | G_GNUC_FALLTHROUGH; + | ^~~~~~~~~~~~~~~ +cc1: all warnings being treated as errors + +GLib is right to warn about this, since it does not know that we +provided our own back-compat definition of the macro. For now we have to +temporarily purge glib's macro entirely in order to get rid of the +warning that is bogus for our usage. + +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +--- + src/ovirt-foreign-menu.c | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) + +diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c +index c19e913..91b6824 100644 +--- a/src/ovirt-foreign-menu.c ++++ b/src/ovirt-foreign-menu.c +@@ -31,12 +31,23 @@ + #include "virt-viewer-util.h" + #include "glib-compat.h" + +-#if !GLIB_CHECK_VERSION(2, 60, 0) +-# if __GNUC_PREREQ (7, 0) +-# define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) +-# else +-# define G_GNUC_FALLTHROUGH do {} while(0) +-# endif ++/* GLib 2.69 annotated macros with version tags, and ++ * since we set GLIB_VERSION_MAX_ALLOWED to 2.48 ++ * it complains if we use G_GNUC_FALLTHROUGH at ++ * all. We temporarily purge the GLib definition ++ * of G_GNUC_FALLTHROUGH and define it ourselves. ++ * When we set min glib >= 2.60, we can delete ++ * all this ++ */ ++#ifndef __GNUC_PREREQ ++# define __GNUC_PREREQ(maj, min) \ ++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) ++#endif ++#undef G_GNUC_FALLTHROUGH ++#if __GNUC_PREREQ (7, 0) ++# define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) ++#else ++# define G_GNUC_FALLTHROUGH do {} while(0) + #endif + + typedef enum { +-- +2.31.1 + diff --git a/virt-viewer.spec b/virt-viewer.spec index 9885675..cdc7425 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -10,11 +10,12 @@ Name: virt-viewer Version: 10.0 -Release: 3%{?dist} +Release: 4%{?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 +Patch1: 0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch Requires: openssh-clients BuildRequires: gcc @@ -45,7 +46,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 +%autosetup -p1 %build %if !%{with_govirt} @@ -77,6 +78,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Wed Aug 11 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-4 +- Fix build with newer glib (rhbz#1988037) + * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1cc2a7dd30faea0abdb7e124a485fc8c08a8fb2b Mon Sep 17 00:00:00 2001 From: Tom Stellard <tstellar@redhat.com> Date: Tue, 16 Nov 2021 07:26:41 +0000 Subject: [PATCH 38/58] Backport fix for uninitialized variable --- 0001-src-initialize-keymaps-variable.patch | 47 ++++++++++++++++++++++ virt-viewer.spec | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0001-src-initialize-keymaps-variable.patch diff --git a/0001-src-initialize-keymaps-variable.patch b/0001-src-initialize-keymaps-variable.patch new file mode 100644 index 0000000..50ac183 --- /dev/null +++ b/0001-src-initialize-keymaps-variable.patch @@ -0,0 +1,47 @@ +From 9e36a59c806de3de77c046df0b8c80bd9a0f4863 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com> +Date: Fri, 23 Apr 2021 15:58:56 +0200 +Subject: [PATCH] src: initialize keymaps variable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +My clang version 11.0.0 (Fedora 11.0.0-2.fc33) complains: +../src/virt-viewer-app.c:610:9: error: variable 'keymaps' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] + if (keymap_string) { + ^~~~~~~~~~~~~ +../src/virt-viewer-app.c:614:10: note: uninitialized use occurs here + if (!keymaps || g_strv_length(keymaps) == 0) { + ^~~~~~~ +../src/virt-viewer-app.c:610:5: note: remove the 'if' if its condition is always true + if (keymap_string) { + ^~~~~~~~~~~~~~~~~~~ +../src/virt-viewer-app.c:595:27: note: initialize the variable 'keymaps' to silence this warning + gchar **key, **keymaps, **valkey, **valuekeys = NULL; + ^ + = NULL +1 error generated. + +Initialize the variable to fix the uninitialized use. + +Signed-off-by: Ján Tomko <jtomko@redhat.com> +--- + src/virt-viewer-app.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c +index 0095398..de2677c 100644 +--- a/src/virt-viewer-app.c ++++ b/src/virt-viewer-app.c +@@ -592,7 +592,7 @@ static + void virt_viewer_app_set_keymap(VirtViewerApp *self, const gchar *keymap_string) + { + VirtViewerAppPrivate *priv = virt_viewer_app_get_instance_private(self); +- gchar **key, **keymaps, **valkey, **valuekeys = NULL; ++ gchar **key, **keymaps = NULL, **valkey, **valuekeys = NULL; + VirtViewerKeyMapping *keyMappingArray, *keyMappingPtr; + guint *mappedArray, *ptrMove; + +-- +2.31.1 + diff --git a/virt-viewer.spec b/virt-viewer.spec index cdc7425..709d08f 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -10,12 +10,13 @@ Name: virt-viewer Version: 10.0 -Release: 4%{?dist} +Release: 5%{?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 Patch1: 0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch +Patch2: 0001-src-initialize-keymaps-variable.patch Requires: openssh-clients BuildRequires: gcc @@ -78,6 +79,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Tue Nov 16 2021 Tom Stellard <tstellar@redhat.com> - 10.0-5 +- Backport fix for uninitialized variable + * Wed Aug 11 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-4 - Fix build with newer glib (rhbz#1988037) From 8e4cdf5923d7ce62e109646d0b5f3372bb6552ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Tue, 30 Nov 2021 11:34:16 +0000 Subject: [PATCH 39/58] Use macros for all meson options and fix bash completion deps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- virt-viewer.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 709d08f..2b0d77f 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -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 From e90193e796b29a9f8e647e6f696e00c03db5734f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Tue, 30 Nov 2021 11:51:27 +0000 Subject: [PATCH 40/58] Rebase to 11.0 release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ...nings-from-use-of-G_GNUC_FALLTHROUGH.patch | 72 ------------------- 0001-src-initialize-keymaps-variable.patch | 47 ------------ sources | 2 +- virt-viewer.spec | 12 ++-- 4 files changed, 8 insertions(+), 125 deletions(-) delete mode 100644 0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch delete mode 100644 0001-src-initialize-keymaps-variable.patch diff --git a/0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch b/0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch deleted file mode 100644 index 8494406..0000000 --- a/0001-src-avoid-warnings-from-use-of-G_GNUC_FALLTHROUGH.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 2e6adf9b85cee3b85a9f7da8d976f3dd022afaa3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> -Date: Tue, 27 Jul 2021 16:25:12 +0100 -Subject: [PATCH] src: avoid warnings from use of G_GNUC_FALLTHROUGH -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since glib >= 2.69 we get warnings: - -../src/ovirt-foreign-menu.c: In function 'ovirt_foreign_menu_next_async_step': -../src/ovirt-foreign-menu.c:319:13: error: Not available before 2.60 [-Werror] - 319 | G_GNUC_FALLTHROUGH; - | ^~~~~~~~~~~~~~~ -../src/ovirt-foreign-menu.c:345:13: error: Not available before 2.60 [-Werror] - 345 | G_GNUC_FALLTHROUGH; - | ^~~~~~~~~~~~~~~ -../src/ovirt-foreign-menu.c:351:13: error: Not available before 2.60 [-Werror] - 351 | G_GNUC_FALLTHROUGH; - | ^~~~~~~~~~~~~~~ -../src/ovirt-foreign-menu.c:357:13: error: Not available before 2.60 [-Werror] - 357 | G_GNUC_FALLTHROUGH; - | ^~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors - -GLib is right to warn about this, since it does not know that we -provided our own back-compat definition of the macro. For now we have to -temporarily purge glib's macro entirely in order to get rid of the -warning that is bogus for our usage. - -Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> ---- - src/ovirt-foreign-menu.c | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -diff --git a/src/ovirt-foreign-menu.c b/src/ovirt-foreign-menu.c -index c19e913..91b6824 100644 ---- a/src/ovirt-foreign-menu.c -+++ b/src/ovirt-foreign-menu.c -@@ -31,12 +31,23 @@ - #include "virt-viewer-util.h" - #include "glib-compat.h" - --#if !GLIB_CHECK_VERSION(2, 60, 0) --# if __GNUC_PREREQ (7, 0) --# define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) --# else --# define G_GNUC_FALLTHROUGH do {} while(0) --# endif -+/* GLib 2.69 annotated macros with version tags, and -+ * since we set GLIB_VERSION_MAX_ALLOWED to 2.48 -+ * it complains if we use G_GNUC_FALLTHROUGH at -+ * all. We temporarily purge the GLib definition -+ * of G_GNUC_FALLTHROUGH and define it ourselves. -+ * When we set min glib >= 2.60, we can delete -+ * all this -+ */ -+#ifndef __GNUC_PREREQ -+# define __GNUC_PREREQ(maj, min) \ -+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -+#endif -+#undef G_GNUC_FALLTHROUGH -+#if __GNUC_PREREQ (7, 0) -+# define G_GNUC_FALLTHROUGH __attribute__((fallthrough)) -+#else -+# define G_GNUC_FALLTHROUGH do {} while(0) - #endif - - typedef enum { --- -2.31.1 - diff --git a/0001-src-initialize-keymaps-variable.patch b/0001-src-initialize-keymaps-variable.patch deleted file mode 100644 index 50ac183..0000000 --- a/0001-src-initialize-keymaps-variable.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9e36a59c806de3de77c046df0b8c80bd9a0f4863 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com> -Date: Fri, 23 Apr 2021 15:58:56 +0200 -Subject: [PATCH] src: initialize keymaps variable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -My clang version 11.0.0 (Fedora 11.0.0-2.fc33) complains: -../src/virt-viewer-app.c:610:9: error: variable 'keymaps' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] - if (keymap_string) { - ^~~~~~~~~~~~~ -../src/virt-viewer-app.c:614:10: note: uninitialized use occurs here - if (!keymaps || g_strv_length(keymaps) == 0) { - ^~~~~~~ -../src/virt-viewer-app.c:610:5: note: remove the 'if' if its condition is always true - if (keymap_string) { - ^~~~~~~~~~~~~~~~~~~ -../src/virt-viewer-app.c:595:27: note: initialize the variable 'keymaps' to silence this warning - gchar **key, **keymaps, **valkey, **valuekeys = NULL; - ^ - = NULL -1 error generated. - -Initialize the variable to fix the uninitialized use. - -Signed-off-by: Ján Tomko <jtomko@redhat.com> ---- - src/virt-viewer-app.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c -index 0095398..de2677c 100644 ---- a/src/virt-viewer-app.c -+++ b/src/virt-viewer-app.c -@@ -592,7 +592,7 @@ static - void virt_viewer_app_set_keymap(VirtViewerApp *self, const gchar *keymap_string) - { - VirtViewerAppPrivate *priv = virt_viewer_app_get_instance_private(self); -- gchar **key, **keymaps, **valkey, **valuekeys = NULL; -+ gchar **key, **keymaps = NULL, **valkey, **valuekeys = NULL; - VirtViewerKeyMapping *keyMappingArray, *keyMappingPtr; - guint *mappedArray, *ptrMove; - --- -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 2b0d77f..08dede4 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -9,14 +9,12 @@ %endif Name: virt-viewer -Version: 10.0 -Release: 6%{?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 -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 @@ -77,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/* @@ -89,6 +87,10 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Tue Nov 30 2021 Daniel P. Berrangé <berrange@redhat.com> - 11.0-1 +- Rebase to 11.0 release +- Fixes often disabled send-key menu (rhbz#2020872) + * 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 From d1d66d09a2422e9466470219a65c580c112546b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 22 Jan 2022 04:04:36 +0000 Subject: [PATCH 41/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 08dede4..17d302a 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -10,7 +10,7 @@ Name: virt-viewer Version: 11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Machine Viewer License: GPLv2+ URL: https://gitlab.com/virt-viewer/virt-viewer @@ -87,6 +87,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 30 2021 Daniel P. Berrangé <berrange@redhat.com> - 11.0-1 - Rebase to 11.0 release - Fixes often disabled send-key menu (rhbz#2020872) From 396a37a3d67166a23d9b53b2709d4f22722970d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 23 Jul 2022 11:59:53 +0000 Subject: [PATCH 42/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 17d302a..b91609a 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -10,7 +10,7 @@ Name: virt-viewer Version: 11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Virtual Machine Viewer License: GPLv2+ URL: https://gitlab.com/virt-viewer/virt-viewer @@ -87,6 +87,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 6b5ff24bd9930880a6a7e7af069fc72481c0f78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Tue, 2 Aug 2022 13:55:34 +0100 Subject: [PATCH 43/58] Fix meson parameter error (rhbz #2113755) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ...ogus-param-for-meson-i18n.merge_file.patch | 50 +++++++++++++++++++ virt-viewer.spec | 6 ++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch diff --git a/0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch b/0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch new file mode 100644 index 0000000..c9ceb9e --- /dev/null +++ b/0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch @@ -0,0 +1,50 @@ +From 98d9f202ef768f22ae21b5c43a080a1aa64a7107 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> +Date: Tue, 26 Apr 2022 17:36:54 +0100 +Subject: [PATCH] data: remove bogus param for meson i18n.merge_file +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The positional parameter used to be treated as 'input', but since we +already set 'input' explicitly it is redundant. With latest meson +versions it now generates an error + +data/meson.build:4:7: ERROR: Function does not take positional arguments. + +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +--- + data/meson.build | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index d718491..4325108 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -2,7 +2,6 @@ if host_machine.system() != 'windows' + desktop = 'remote-viewer.desktop' + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -14,7 +13,6 @@ if host_machine.system() != 'windows' + mimetypes = 'virt-viewer-mime.xml' + + i18n.merge_file ( +- mimetypes, + type: 'xml', + input: mimetypes + '.in', + output: mimetypes, +@@ -27,7 +25,6 @@ if host_machine.system() != 'windows' + metainfo = 'remote-viewer.appdata.xml' + + i18n.merge_file ( +- metainfo, + type: 'xml', + input: metainfo + '.in', + output: metainfo, +-- +2.37.1 + diff --git a/virt-viewer.spec b/virt-viewer.spec index b91609a..5bbbbab 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -10,11 +10,12 @@ Name: virt-viewer Version: 11.0 -Release: 3%{?dist} +Release: 4%{?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 +Patch: 0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch Requires: openssh-clients # Our bash completion script uses virsh to list domains @@ -87,6 +88,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Tue Aug 2 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-4 +- Fix meson parameter error (rhbz #2113755) + * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1c755670cc41e20ae28ff50f51d0e7162ffddf07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Mon, 22 Aug 2022 15:24:22 +0100 Subject: [PATCH 44/58] Disable govirt since it is still stuck on soup2 (rhbz#2119727) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- virt-viewer.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 5bbbbab..5bf80d5 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -4,13 +4,14 @@ %global with_govirt 0 %global with_spice 0 %else -%global with_govirt 1 +# Disabled since it is still stuck on soup2 +%global with_govirt 0 %global with_spice 1 %endif Name: virt-viewer Version: 11.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Virtual Machine Viewer License: GPLv2+ URL: https://gitlab.com/virt-viewer/virt-viewer @@ -88,6 +89,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Mon Aug 22 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-5 +- Disable govirt since it is still stuck on soup2 (rhbz#2119727) + * Tue Aug 2 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-4 - Fix meson parameter error (rhbz #2113755) From 82dee1f41455c93912b48d515a235cf985df6edb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 21 Jan 2023 06:23:45 +0000 Subject: [PATCH 45/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 5bf80d5..0284701 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -11,7 +11,7 @@ Name: virt-viewer Version: 11.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Virtual Machine Viewer License: GPLv2+ URL: https://gitlab.com/virt-viewer/virt-viewer @@ -89,6 +89,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Aug 22 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-5 - Disable govirt since it is still stuck on soup2 (rhbz#2119727) From 94cdf59cf471a408ab3518060e5311560a88b1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Wed, 26 Apr 2023 17:48:56 +0100 Subject: [PATCH 46/58] Convert license to SPDX format MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- virt-viewer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 0284701..3e60661 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -13,7 +13,7 @@ Name: virt-viewer Version: 11.0 Release: 6%{?dist} Summary: Virtual Machine Viewer -License: GPLv2+ +License: GPL-2.0-or-later URL: https://gitlab.com/virt-viewer/virt-viewer Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz Patch: 0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch From 477761744846305911fd27650219906f7713fac3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 22 Jul 2023 17:45:09 +0000 Subject: [PATCH 47/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 3e60661..0e2b779 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -11,7 +11,7 @@ Name: virt-viewer Version: 11.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Virtual Machine Viewer License: GPL-2.0-or-later URL: https://gitlab.com/virt-viewer/virt-viewer @@ -89,6 +89,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a6368324e13a172e7f7219ad599f41551f8874cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 27 Jan 2024 07:58:09 +0000 Subject: [PATCH 48/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 0e2b779..4e85a7d 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -11,7 +11,7 @@ Name: virt-viewer Version: 11.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Virtual Machine Viewer License: GPL-2.0-or-later URL: https://gitlab.com/virt-viewer/virt-viewer @@ -89,6 +89,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 78c6d28842d5eb74c9c65c836013baf3dae10f65 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz <yselkowi@redhat.com> Date: Thu, 28 Mar 2024 16:42:55 -0400 Subject: [PATCH 49/58] Fix flatpak build perl-podlators is built in /app for perl-dependent flatpaks, so do not assume the location of pod2man. --- virt-viewer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 4e85a7d..340ff03 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -35,7 +35,7 @@ BuildRequires: pkgconfig(vte-2.91) BuildRequires: pkgconfig(spice-client-gtk-3.0) BuildRequires: pkgconfig(spice-protocol) %endif -BuildRequires: /usr/bin/pod2man +BuildRequires: perl-podlators BuildRequires: gettext %if %{with_govirt} BuildRequires: pkgconfig(govirt-1.0) From b64e288bf594008c79a81156f3ab3c7249bc3ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Tue, 9 Jul 2024 11:31:55 +0100 Subject: [PATCH 50/58] Bump release for pod2man dep change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 340ff03..8f81d8d 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -11,7 +11,7 @@ Name: virt-viewer Version: 11.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Virtual Machine Viewer License: GPL-2.0-or-later URL: https://gitlab.com/virt-viewer/virt-viewer @@ -89,6 +89,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Tue Jul 9 2024 Daniel P. Berrangé <berrange@redhat.com> - 11.0-9 +- Tweak pod2man dep to suit flatpak builds better + * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9ccf41175af1e81fb78a9324cc22efab912a80c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 20 Jul 2024 08:53:18 +0000 Subject: [PATCH 51/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 8f81d8d..479c0ed 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -11,7 +11,7 @@ Name: virt-viewer Version: 11.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Virtual Machine Viewer License: GPL-2.0-or-later URL: https://gitlab.com/virt-viewer/virt-viewer @@ -89,6 +89,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 9 2024 Daniel P. Berrangé <berrange@redhat.com> - 11.0-9 - Tweak pod2man dep to suit flatpak builds better From 4b14ad0fe45af7938933f26546b86cbf3337f209 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sun, 19 Jan 2025 14:28:33 +0000 Subject: [PATCH 52/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- virt-viewer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 479c0ed..3d7f2ef 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -11,7 +11,7 @@ Name: virt-viewer Version: 11.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Virtual Machine Viewer License: GPL-2.0-or-later URL: https://gitlab.com/virt-viewer/virt-viewer @@ -89,6 +89,9 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog +* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9fcdfda67ba0ba2a314886a9c56d00852675c929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Wed, 19 Feb 2025 18:37:12 +0000 Subject: [PATCH 53/58] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 64 +++++++++++++++++++++++++++++++++++++++++++++ virt-viewer.spec | 67 ++---------------------------------------------- 2 files changed, 66 insertions(+), 65 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..9953d04 --- /dev/null +++ b/changelog @@ -0,0 +1,64 @@ +* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jul 9 2024 Daniel P. Berrangé <berrange@redhat.com> - 11.0-9 +- Tweak pod2man dep to suit flatpak builds better + +* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Aug 22 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-5 +- Disable govirt since it is still stuck on soup2 (rhbz#2119727) + +* Tue Aug 2 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-4 +- Fix meson parameter error (rhbz #2113755) + +* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 30 2021 Daniel P. Berrangé <berrange@redhat.com> - 11.0-1 +- Rebase to 11.0 release +- Fixes often disabled send-key menu (rhbz#2020872) + +* 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 + +* Wed Aug 11 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-4 +- Fix build with newer glib (rhbz#1988037) + +* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Apr 26 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-2 +- Explicitly disable spice/ovirt + +* Tue Apr 20 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-1 +- Update to 10.0 release + +* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 1 2020 Daniel P. Berrangé <berrange@redhat.com> - 9.0-1 +- Update to 9.0 release + +* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/virt-viewer.spec b/virt-viewer.spec index 3d7f2ef..22a9adb 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -11,7 +11,7 @@ Name: virt-viewer Version: 11.0 -Release: 11%{?dist} +Release: %autorelease Summary: Virtual Machine Viewer License: GPL-2.0-or-later URL: https://gitlab.com/virt-viewer/virt-viewer @@ -89,67 +89,4 @@ the display, and libvirt for looking up VNC/SPICE server details. %{_datadir}/bash-completion/completions/virt-viewer %changelog -* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jul 9 2024 Daniel P. Berrangé <berrange@redhat.com> - 11.0-9 -- Tweak pod2man dep to suit flatpak builds better - -* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Aug 22 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-5 -- Disable govirt since it is still stuck on soup2 (rhbz#2119727) - -* Tue Aug 2 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-4 -- Fix meson parameter error (rhbz #2113755) - -* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Nov 30 2021 Daniel P. Berrangé <berrange@redhat.com> - 11.0-1 -- Rebase to 11.0 release -- Fixes often disabled send-key menu (rhbz#2020872) - -* 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 - -* Wed Aug 11 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-4 -- Fix build with newer glib (rhbz#1988037) - -* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon Apr 26 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-2 -- Explicitly disable spice/ovirt - -* Tue Apr 20 2021 Daniel P. Berrangé <berrange@redhat.com> - 10.0-1 -- Update to 10.0 release - -* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri May 1 2020 Daniel P. Berrangé <berrange@redhat.com> - 9.0-1 -- Update to 9.0 release - -* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +%autochangelog From 831cbc1b2dc49bb6ad0d3b0179eb1c7586d3b476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Wed, 19 Feb 2025 18:33:02 +0000 Subject: [PATCH 54/58] Handle new CA cert credential type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids prematurely terminating TLS connections due to unknown credential types. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- ...Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch | 89 +++++++++++++++++++ virt-viewer.spec | 3 +- 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 0001-Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch diff --git a/0001-Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch b/0001-Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch new file mode 100644 index 0000000..9b45db3 --- /dev/null +++ b/0001-Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch @@ -0,0 +1,89 @@ +From de864c14146c120b46d435949b1d8d0b11e57b85 Mon Sep 17 00:00:00 2001 +From: Jean-Louis Dupond <jean-louis@dupond.be> +Date: Thu, 25 May 2023 16:22:14 +0200 +Subject: [PATCH] Read oVirt CA and pass it to gtk-vnc + +The connection file created by oVirt contains the trusted CA. +When https://gitlab.gnome.org/GNOME/gtk-vnc/-/merge_requests/24 is +merged, we can pass this CA certificate to gtk-vnc to have it trusted. +This can replace manually putting the cacert.pem into ~/.pki/CA/ + +Signed-off-by: Jean-Louis Dupond <jean-louis@dupond.be> +--- + src/virt-viewer-session-vnc.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/src/virt-viewer-session-vnc.c b/src/virt-viewer-session-vnc.c +index 6281bd0..1635c1b 100644 +--- a/src/virt-viewer-session-vnc.c ++++ b/src/virt-viewer-session-vnc.c +@@ -42,6 +42,9 @@ + #if VNC_CHECK_VERSION(1, 2, 0) + # define HAVE_VNC_POWER_CONTROL + #endif ++#if VNC_CHECK_VERSION(1, 3, 2) ++# define HAVE_VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA ++#endif + + struct _VirtViewerSessionVnc { + VirtViewerSession parent; +@@ -343,8 +346,8 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED, + VirtViewerSession *session) + { + VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session); +- char *username = NULL, *password = NULL; +- gboolean wantPassword = FALSE, wantUsername = FALSE; ++ char *username = NULL, *password = NULL, *ca = NULL; ++ gboolean wantPassword = FALSE, wantUsername = FALSE, wantCA = FALSE; + VirtViewerFile *file = NULL; + int i; + +@@ -360,6 +363,9 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED, + wantPassword = TRUE; + break; + case VNC_DISPLAY_CREDENTIAL_CLIENTNAME: ++#ifdef HAVE_VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA ++ case VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA: ++#endif + break; + default: + g_debug("Unsupported credential type %d", g_value_get_enum(cred)); +@@ -382,6 +388,10 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED, + password = virt_viewer_file_get_password(file); + wantPassword = FALSE; + } ++ ca = virt_viewer_file_get_ovirt_ca(file); ++ if (wantCA && ca) { ++ wantCA = FALSE; ++ } + } + + if (wantUsername || wantPassword) { +@@ -427,6 +437,16 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED, + vnc_display_close(self->vnc); + } + break; ++#ifdef HAVE_VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA ++ case VNC_DISPLAY_CREDENTIAL_CA_CERT_DATA: ++ if (vnc_display_set_credential(self->vnc, ++ g_value_get_enum(cred), ++ ca)) { ++ g_debug("Failed to set credential type %d", g_value_get_enum(cred)); ++ vnc_display_close(self->vnc); ++ } ++ break; ++#endif + default: + g_debug("Unsupported credential type %d", g_value_get_enum(cred)); + vnc_display_close(self->vnc); +@@ -436,6 +456,7 @@ virt_viewer_session_vnc_auth_credential(GtkWidget *src G_GNUC_UNUSED, + cleanup: + g_free(username); + g_free(password); ++ g_free(ca); + } + + +-- +2.47.1 + diff --git a/virt-viewer.spec b/virt-viewer.spec index 22a9adb..3242228 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -17,6 +17,7 @@ License: GPL-2.0-or-later URL: https://gitlab.com/virt-viewer/virt-viewer Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz Patch: 0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch +Patch: 0001-Read-oVirt-CA-and-pass-it-to-gtk-vnc.patch Requires: openssh-clients # Our bash completion script uses virsh to list domains @@ -29,7 +30,7 @@ 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(gtk-vnc-2.0) >= 1.5.0 BuildRequires: pkgconfig(vte-2.91) %if %{with_spice} BuildRequires: pkgconfig(spice-client-gtk-3.0) From 3ee6aace89d421cc163e23863a7c710f3e03f37c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Fri, 25 Jul 2025 20:09:12 +0000 Subject: [PATCH 55/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c708bc607699c7f88af53a36d810b5da3d501933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> Date: Wed, 17 Dec 2025 15:17:28 +0000 Subject: [PATCH 56/58] Disable -Werror on Fedora/ELN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- virt-viewer.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/virt-viewer.spec b/virt-viewer.spec index 3242228..d39882c 100644 --- a/virt-viewer.spec +++ b/virt-viewer.spec @@ -57,6 +57,15 @@ the display, and libvirt for looking up VNC/SPICE server details. %define buildid_opt -Dbuild-id=%{release} +# Enable -Werror on RHEL which has stable GCC toolchain, and +# disable on Fedora/ELN which frequently sees new warnings +# from updated GCC versions +%if 0%{?rhel} && !0%{?eln} +%define werror_opt -Dwerror=true +%else +%define werror_opt -Dwerror=false -Dgit_werror=disabled +%endif + %if !%{with_govirt} %define ovirt_opt -Dovirt=disabled %endif @@ -69,7 +78,7 @@ the display, and libvirt for looking up VNC/SPICE server details. %define osid_opt -Dos-id=rhel%{?rhel} %endif -%meson %{buildid_opt} %{?ovirt_opt} %{?spice_opt} %{?osid_opt} +%meson %{buildid_opt} %{werror_opt} %{?ovirt_opt} %{?spice_opt} %{?osid_opt} %meson_build %install From 6a7071dd9e1929da1205ee0bd977c404d38107df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Sat, 17 Jan 2026 19:58:45 +0000 Subject: [PATCH 57/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 354d6c059b91d9ddeb6459a1d63203486d915073 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering <releng@fedoraproject.org> Date: Fri, 17 Jul 2026 08:32:52 +0000 Subject: [PATCH 58/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild