From 5c97b13cc891af9bda9e17fdf92c0f1e9ec22dd0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 18 Jun 2019 12:44:10 -0400 Subject: [PATCH] import virt-viewer-7.0-3.el8_0.1 --- .gitignore | 1 + .virt-viewer.metadata | 1 + ...isplays-on-wrong-monitors-in-Wayland.patch | 71 ++++ .../0002-ovirt-Fix-initial-connection.patch | 73 ++++ SPECS/virt-viewer.spec | 334 ++++++++++++++++++ 5 files changed, 480 insertions(+) create mode 100644 .gitignore create mode 100644 .virt-viewer.metadata create mode 100644 SOURCES/0001-Fullscreen-displays-on-wrong-monitors-in-Wayland.patch create mode 100644 SOURCES/0002-ovirt-Fix-initial-connection.patch create mode 100644 SPECS/virt-viewer.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dc87496 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/virt-viewer-7.0.tar.gz diff --git a/.virt-viewer.metadata b/.virt-viewer.metadata new file mode 100644 index 0000000..e74e6f9 --- /dev/null +++ b/.virt-viewer.metadata @@ -0,0 +1 @@ +06ea5b6b25cce4f0d5c18bcbe28cdd16f0075b66 SOURCES/virt-viewer-7.0.tar.gz diff --git a/SOURCES/0001-Fullscreen-displays-on-wrong-monitors-in-Wayland.patch b/SOURCES/0001-Fullscreen-displays-on-wrong-monitors-in-Wayland.patch new file mode 100644 index 0000000..e29c4de --- /dev/null +++ b/SOURCES/0001-Fullscreen-displays-on-wrong-monitors-in-Wayland.patch @@ -0,0 +1,71 @@ +From 71419bfa71b435ee0374d491dcec81911c75394b Mon Sep 17 00:00:00 2001 +From: Jonathon Jongsma +Date: Fri, 12 Oct 2018 14:11:11 -0500 +Subject: [PATCH virt-viewer] Fullscreen displays on wrong monitors in Wayland + +In fullscreen mode, we attempt to enable a guest display for each client +monitor and then place a fullscreen window for each display on the +appropriate monitor. Previously, we were using gtk_window_move() to move +the window to the proper monitor, and then calling +gtk_window_fullscreen() to enter fullscreen mode on that monitor. +However, under wayland, gtk_window_move() no longer has any effect for +toplevel windows, so all displays were showing up on top of eachother on +the same client monitor. + +Fortunately, Gtk+ 3.18 added a new gtk_window_fullscreen_on_monitor() +API that works on Wayland. In theory this allows us to remove the call +to gtk_window_move() from the code. But to avoid potentially changing +behavior on xorg or older systems, I left the existing logic. + +This requires a dependency bump for gtk+ from 3.12 to 3.18. Gtk 3.18 is +provided by the following distributions (or newer): + - RHEL 7.4 + - Fedora 23 + - Ubuntu 16.04LTS + +Resolves: rhbz#1584561 + +Signed-off-by: Jonathon Jongsma +Acked-by: Christophe Fergeau +--- + configure.ac | 4 ++-- + src/virt-viewer-window.c | 8 +++++++- + 2 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 9b52eb4..e349e62 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,8 +17,8 @@ GLIB2_REQUIRED="2.38" + GLIB2_ENCODED_VERSION="GLIB_VERSION_2_38" + + # Keep these two definitions in agreement. +-GTK_REQUIRED="3.12" +-GTK_ENCODED_VERSION="GDK_VERSION_3_12" ++GTK_REQUIRED="3.18" ++GTK_ENCODED_VERSION="GDK_VERSION_3_18" + + LIBXML2_REQUIRED="2.6.0" + LIBVIRT_REQUIRED="0.10.0" +diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c +index 241b627..aace0f8 100644 +--- a/src/virt-viewer-window.c ++++ b/src/virt-viewer-window.c +@@ -525,7 +525,13 @@ virt_viewer_window_enter_fullscreen(VirtViewerWindow *self, gint monitor) + } + virt_viewer_window_move_to_monitor(self); + +- gtk_window_fullscreen(GTK_WINDOW(priv->window)); ++ if (monitor == -1) { ++ // just go fullscreen on the current monitor ++ gtk_window_fullscreen(GTK_WINDOW(priv->window)); ++ } else { ++ gtk_window_fullscreen_on_monitor(GTK_WINDOW(priv->window), ++ gdk_screen_get_default(), monitor); ++ } + } + + #define MAX_KEY_COMBO 4 +-- +2.17.2 + diff --git a/SOURCES/0002-ovirt-Fix-initial-connection.patch b/SOURCES/0002-ovirt-Fix-initial-connection.patch new file mode 100644 index 0000000..96d2029 --- /dev/null +++ b/SOURCES/0002-ovirt-Fix-initial-connection.patch @@ -0,0 +1,73 @@ +From fe7aad2002ebbeef4c99e1777371e71c9b3dcb7b Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Thu, 6 Dec 2018 11:57:12 +0100 +Subject: [PATCH] ovirt: Fix initial connection + +After commit df42f78d46 "remote-viewer: factor our +remote_viewer_initial_connect()", the initial connection code only gets +run in the !ovirt case. When ovirt is in use, the initial connection +never happens, meaning all we get when using ovirt:// is a blank +virt-viewer window. + +This commit fixes that by moving creation of the ovirt session to +remote_viewer_initial_connect, and unconditionnally calling the +remote_viewer_initial_connect rather than only doing it in the !ovirt +case. + +https://bugzilla.redhat.com/show_bug.cgi?id=1655537 + +Signed-off-by: Christophe Fergeau +--- + src/remote-viewer.c | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) + +diff --git a/src/remote-viewer.c b/src/remote-viewer.c +index 4e1021b..989466b 100644 +--- a/src/remote-viewer.c ++++ b/src/remote-viewer.c +@@ -684,9 +684,18 @@ remote_viewer_initial_connect(RemoteViewer *self, const gchar *type, const gchar + { + VirtViewerApp *app = VIRT_VIEWER_APP(self); + +- if (!virt_viewer_app_create_session(app, type, error)) +- return FALSE; +- ++#ifdef HAVE_OVIRT ++ if (g_strcmp0(type, "ovirt") == 0) { ++ if (!create_ovirt_session(app, guri, error)) { ++ g_prefix_error(error, _("Couldn't open oVirt session: ")); ++ return FALSE; ++ } ++ } else ++#endif ++ { ++ if (!virt_viewer_app_create_session(app, type, error)) ++ return FALSE; ++ } + + g_signal_connect(virt_viewer_app_get_session(app), "session-connected", + G_CALLBACK(remote_viewer_session_connected), g_strdup(guri)); +@@ -782,18 +791,8 @@ retry_dialog: + _("Cannot determine the connection type from URI")); + goto cleanup; + } +-#ifdef HAVE_OVIRT +- if (g_strcmp0(type, "ovirt") == 0) { +- if (!create_ovirt_session(app, guri, &error)) { +- g_prefix_error(&error, _("Couldn't open oVirt session: ")); +- goto cleanup; +- } +- } else +-#endif +- { +- if (!remote_viewer_initial_connect(self, type, guri, vvfile, &error)) +- goto cleanup; +- } ++ if (!remote_viewer_initial_connect(self, type, guri, vvfile, &error)) ++ goto cleanup; + } + + ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->start(app, &error); +-- +2.19.2 + diff --git a/SPECS/virt-viewer.spec b/SPECS/virt-viewer.spec new file mode 100644 index 0000000..edbcb5d --- /dev/null +++ b/SPECS/virt-viewer.spec @@ -0,0 +1,334 @@ +# -*- rpm-spec -*- + +%global _hardened_build 1 + +# 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 1} + +%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 +%endif + +Name: virt-viewer +Version: 7.0 +Release: 3%{?dist}%{?extra_release}.1 +Summary: Virtual Machine Viewer +Group: Applications/System +License: GPLv2+ +URL: https://virt-manager.org/ +Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz + +Patch001: 0001-Fullscreen-displays-on-wrong-monitors-in-Wayland.patch +Patch002: 0002-ovirt-Fix-initial-connection.patch + +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: gcc +BuildRequires: pkgconfig(glib-2.0) >= 2.38 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.18 +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.35 +BuildRequires: pkgconfig(spice-protocol) >= 0.12.7 +%endif +BuildRequires: /usr/bin/pod2man +BuildRequires: intltool +%if %{with_govirt} +BuildRequires: pkgconfig(govirt-1.0) >= 0.3.2 +%endif + +%if 0%{?fedora} >= 20 +Obsoletes: spice-client < 0.12.3-2 +%endif + + +%description +Virtual Machine Viewer provides a graphical console client for connecting +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 + +%patch001 -p1 +%patch002 -p1 + +%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-buildid=%{release} --disable-update-mimedb --with-osid=rhel%{?rhel} +%__make %{?_smp_mflags} V=1 + + +%install +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} +%{_bindir}/remote-viewer +%{_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 +%{_mandir}/man1/virt-viewer.1* +%{_mandir}/man1/remote-viewer.1* + +%changelog +* Wed May 29 2019 Victor Toso - 7.0-3.1 +- Fix build for z-stream. + Related: rhbz#1714742 + +* Wed Mar 20 2019 Victor Toso - 7.0-4 +- Some .spec file changes missed by rebase from F28 on RHEL-8.0 + Resolves: rhbz#1714742 + +* Tue Dec 18 2018 Victor Toso - 7.0-3 +- Fix connection with ovirt + Resolves: rhbz#1584561 + +* Tue Oct 16 2018 Jonathon Jongsma - 7.0-2 +- Fix fullscreen displays on wrong monitors in wayland + Resolves: rhbz#1584561 + +* Fri Jul 27 2018 Daniel P. Berrangé - 7.0-1 +- Update to 7.0 release + +* Sat Jul 14 2018 Fedora Release Engineering - 6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 28 2018 Fabiano Fidêncio - 6.0-5 +- Add missing patch for spice-controller so being removed + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* Mon Jan 12 2015 Daniel P. Berrange - 2.0-1 +- Update to 2.0 release + +* Sat Sep 27 2014 Rex Dieter - 1.0-3 +- update/optimize mime scriptlets + +* Mon Aug 18 2014 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 21 2014 Daniel P. Berrange - 1.0-1 +- Update to 1.0 release + +* Sun Jun 08 2014 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Feb 26 2014 Christophe Fergeau 0.6.0-1 +- Update to 0.6.0 release + +* Tue Nov 26 2013 Christophe Fergeau 0.5.7-2 +- Rebuild for new libgovirt + +* Wed Jul 31 2013 Daniel P. Berrange - 0.5.7-1 +- Update to 0.5.7 release + +* Thu May 23 2013 Christophe Fergeau - 0.5.6-2 +- Mark remote-viewer as replacing spice-client + +* Wed May 1 2013 Daniel P. Berrange - 0.5.6-1 +- Update to 0.5.6 release + +* Wed Feb 13 2013 Daniel P. Berrange - 0.5.5-1 +- Update to 0.5.5 release + +* Fri Dec 14 2012 Cole Robinson - 0.5.4-3 +- Fix crash after entering spice password (bz #880381) + +* Sat Oct 13 2012 Chris Tyler - 0.5.4-2 +- Enabled spice support for ARM archs + +* Mon Sep 17 2012 Daniel P. Berrange - 0.5.4-1 +- Update to 0.5.4 release + +* Fri Sep 14 2012 Hans de Goede - 0.5.3-6 +- Rebuild for spice-gtk ABI breakage (previous spice-gtk build was borked) + +* Tue Sep 11 2012 Hans de Goede - 0.5.3-5 +- Rebuild for spice-gtk ABI breakage + +* Fri Sep 7 2012 Hans de Goede - 0.5.3-4 +- Rebuild for spice-gtk soname change + +* Mon Aug 13 2012 Daniel P. Berrange - 0.5.3-3 +- Rebuild for spice-gtk soname change + +* Sun Jul 22 2012 Fedora Release Engineering - 0.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed May 16 2012 Daniel P. Berrange - 0.5.3-1 +- Update to 0.5.3 release + +* Fri Mar 9 2012 Daniel P. Berrange - 0.5.2-1 +- Update to 0.5.2 release + +* Fri Feb 17 2012 Daniel P. Berrange - 0.5.1-1 +- Update to 0.5.1 release + +* Tue Feb 14 2012 Daniel P. Berrange - 0.5.0-1 +- Update to 0.5.0 release + +* Sat Jan 14 2012 Fedora Release Engineering - 0.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 9 2011 Daniel P. Berrange - 0.4.2-1 +- Update to 0.4.2 release + +* Sun Aug 14 2011 Daniel P. Berrange - 0.4.1-3 +- More ssh tunnelling port fixes + +* Fri Aug 12 2011 Daniel P. Berrange - 0.4.1-2 +- Fix ssh tunnelling + +* Thu Aug 4 2011 Daniel P. Berrange - 0.4.1-1 +- Update to 0.4.1 release + +* Tue Aug 2 2011 Daniel P. Berrange - 0.4.0-2 +- Rebuild for accidental spice-glib soname change + +* Tue Jul 12 2011 Daniel P. Berrange - 0.4.0-1 +- Update to 0.4.0 release +- Switch build to GTK3 instead of GTK2 + +* Tue May 31 2011 Daniel P. Berrange - 0.3.1-2 +- Rebuild for spice-glib ABI breakage + +* Wed May 11 2011 Karsten Hopp 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 - 0.3.1-1 +- Update to 0.3.1 release + +* Mon Feb 21 2011 Daniel P. Berrange - 0.3.0-1 +- Update to 0.3.0 and enable SPICE + +* Mon Feb 07 2011 Fedora Release Engineering - 0.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 15 2010 Daniel P. Berrange - 0.2.1-1 +- Update to 0.2.1 release + +* Wed Jul 29 2009 Daniel P. Berrange - 0.2.0-1.fc12 +- Update to 0.2.0 release + +* Sun Jul 26 2009 Fedora Release Engineering - 0.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu May 7 2009 Daniel P. Berrange - 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 - 0.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jul 7 2008 Tom "spot" Callaway - 0.0.3-3.fc10 +- fix conditional comparison +- remove file dep + +* Wed Jun 25 2008 Daniel P. Berrange - 0.0.3-2.fc10 +- Rebuild for GNU TLS ABI bump + +* Mon Mar 10 2008 Daniel P. Berrange - 0.0.3-1.fc9 +- Updated to 0.0.3 release + +* Mon Feb 18 2008 Fedora Release Engineering - 0.0.2-4 +- Autorebuild for GCC 4.3 + +* Fri Jan 11 2008 Daniel P. Berrange - 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 - 0.0.2-2.fc8 +- Change TLS x509 credential name to sync with libvirt + +* Tue Aug 28 2007 Daniel P. Berrange - 0.0.2-1.fc8 +- Added support for remote console access + +* Fri Aug 17 2007 Daniel P. Berrange - 0.0.1-2.fc8 +- Restrict built to x86 & ia64 because libvirt is only on those arches + +* Wed Aug 15 2007 Daniel P. Berrange - 0.0.1-1.fc8 +- First release