Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

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
+

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

virt-viewer.spec

@@ -11,12 +11,13 @@
 
 Name: virt-viewer
 Version: 11.0
-Release: 5%{?dist}
+Release: %autorelease
 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
+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,13 +30,13 @@ 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)
 BuildRequires: pkgconfig(spice-protocol)
 %endif
-BuildRequires: /usr/bin/pod2man
+BuildRequires: perl-podlators
 BuildRequires: gettext
 %if %{with_govirt}
 BuildRequires: pkgconfig(govirt-1.0)
@@ -56,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
@@ -68,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
@@ -89,49 +99,4 @@ 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)
-
-* 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