From 43b68fbced737e239266e098ece342ee687309cb Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Sat, 15 Nov 2025 19:31:25 +0100 Subject: [PATCH] virt-manager-5.1.0-1.el9 - Rebased to virt-manager-5.1.0 (RHEL-119340) - The rebase also fixes the following bugs: RHEL-105819 Resolves: RHEL-105819, RHEL-119340 --- .gitignore | 1 + sources | 2 +- virt-manager-Disable-spice.patch | 43 ------------------- ...-update-link-to-virt-manager-sources.patch | 28 ------------ ...oudinit-include-empty-meta-data-file.patch | 35 +++++++++++++++ virt-manager.spec | 27 +++++++++--- 6 files changed, 57 insertions(+), 79 deletions(-) delete mode 100644 virt-manager-Disable-spice.patch delete mode 100644 virt-manager-spec-update-link-to-virt-manager-sources.patch create mode 100644 virt-manager-virtinst-cloudinit-include-empty-meta-data-file.patch diff --git a/.gitignore b/.gitignore index 9d65bcb..3a2b2fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /virt-manager-*.tar.gz /virt-manager-5.0.0.tar.xz +/virt-manager-5.1.0.tar.xz diff --git a/sources b/sources index c58d7d0..e062edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (virt-manager-5.0.0.tar.xz) = d0cb7eb844fc98ad29413717e5fa5834bc6f9f6cb6b9339b59c2721bb37a58f71280e3d2a04a64a6021614626329d76c92474f826bb1d9b7a9040b479f20d4e8 +SHA512 (virt-manager-5.1.0.tar.xz) = 6306500ae442a6ccb36d5f19bc26b0e32984ca145ee8d41a475e175ee4db6c0d253f0cf9d908c30e3269cf7aabdad4bbd30e84f3cd0477f233da1e43e0235e3c diff --git a/virt-manager-Disable-spice.patch b/virt-manager-Disable-spice.patch deleted file mode 100644 index 2c12e10..0000000 --- a/virt-manager-Disable-spice.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 866a53d3e8ef1d536bc7b3f41560ba71f7e81c79 Mon Sep 17 00:00:00 2001 -Message-ID: <866a53d3e8ef1d536bc7b3f41560ba71f7e81c79.1733156402.git.phrdina@redhat.com> -From: Pavel Hrdina -Date: Mon, 2 Dec 2024 16:55:04 +0100 -Subject: [PATCH] Disable spice - -- Disable spice options in virt-manager. - -Resolves: #1946939 - -Signed-off-by: Jonathon Jongsma ---- - virt-manager.spec.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/virt-manager.spec.in b/virt-manager.spec.in -index c22ed32b5..fba140388 100644 ---- a/virt-manager.spec.in -+++ b/virt-manager.spec.in -@@ -23,7 +23,6 @@ Requires: python3-gobject >= 3.31.3 - Requires: gtk3 >= 3.22.0 - Requires: libvirt-glib >= 0.0.9 - Requires: gtk-vnc2 --Requires: spice-gtk3 - - # virt-manager is one of those apps that people will often install onto - # a headless machine for use over SSH. This means the virt-manager dep -@@ -104,8 +103,13 @@ machine). - - - %build -+%if 0%{?rhel} -+%global _default_graphics -Ddefault-graphics=vnc -+%endif -+ - %meson \ - -Ddefault-hvs=%{default_hvs} \ -+ %{?_default_graphics} \ - -Dupdate-icon-cache=false \ - -Dcompile-schemas=false \ - -Dtests=disabled --- -2.47.0 diff --git a/virt-manager-spec-update-link-to-virt-manager-sources.patch b/virt-manager-spec-update-link-to-virt-manager-sources.patch deleted file mode 100644 index 7297b2a..0000000 --- a/virt-manager-spec-update-link-to-virt-manager-sources.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3b5840b5b91667638f26749d102ad69788566aa1 Mon Sep 17 00:00:00 2001 -Message-ID: <3b5840b5b91667638f26749d102ad69788566aa1.1733156402.git.phrdina@redhat.com> -From: Pavel Hrdina -Date: Fri, 29 Nov 2024 20:59:27 +0100 -Subject: [PATCH] spec: update link to virt-manager sources - -Signed-off-by: Pavel Hrdina -(cherry picked from commit b74730ebb6556dcbcc3b4e4993c79304c309cab4) -Signed-off-by: Pavel Hrdina ---- - virt-manager.spec.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/virt-manager.spec.in b/virt-manager.spec.in -index fba140388..2805d3d88 100644 ---- a/virt-manager.spec.in -+++ b/virt-manager.spec.in -@@ -15,7 +15,7 @@ Summary: Desktop tool for managing virtual machines via libvirt - License: GPL-2.0-or-later - BuildArch: noarch - URL: https://virt-manager.org/ --Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz -+Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz - - - Requires: virt-manager-common = %{verrel} --- -2.47.0 diff --git a/virt-manager-virtinst-cloudinit-include-empty-meta-data-file.patch b/virt-manager-virtinst-cloudinit-include-empty-meta-data-file.patch new file mode 100644 index 0000000..7cd702a --- /dev/null +++ b/virt-manager-virtinst-cloudinit-include-empty-meta-data-file.patch @@ -0,0 +1,35 @@ +From 5975697d6f4de570af55754f612b72f9529431ec Mon Sep 17 00:00:00 2001 +Message-ID: <5975697d6f4de570af55754f612b72f9529431ec.1763231468.git.phrdina@redhat.com> +From: Pavel Hrdina +Date: Mon, 29 Sep 2025 16:14:35 +0200 +Subject: [PATCH] virtinst: cloudinit: include empty meta-data file + +From: Pavel Hrdina + +Refactor creation of cloud-init config files introduced a bug where we +stopped including empty meta-data file. + +Introduced-by: 5b2d0997a1d2d213b17c227169da64e2fa7d09a6 +Fixes: https://github.com/virt-manager/virt-manager/issues/975 +Signed-off-by: Pavel Hrdina +(cherry picked from commit ea71cf9a8a4161ce6e19eacf5f0d86d40ab74f23) +Signed-off-by: Pavel Hrdina +--- + virtinst/install/cloudinit.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/virtinst/install/cloudinit.py b/virtinst/install/cloudinit.py +index 3f565f399..b2378fbfa 100644 +--- a/virtinst/install/cloudinit.py ++++ b/virtinst/install/cloudinit.py +@@ -36,7 +36,7 @@ class _CloudInitConfig: + def _create_file(self): + content = self._content() + +- if not content: ++ if content is None: + return None + + fileobj = tempfile.NamedTemporaryFile( +-- +2.51.1 diff --git a/virt-manager.spec b/virt-manager.spec index 36b9449..4e0f10f 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,13 +1,14 @@ # -*- rpm-spec -*- -%global with_guestfs 0 -%global default_hvs "qemu,xen,lxc" +%global default_hvs "qemu,xen,lxc" +%global have_spice %{defined fedora} + # End local config Name: virt-manager -Version: 5.0.0 +Version: 5.1.0 Release: 1%{?dist}%{?extra_release} %global verrel %{version}-%{release} @@ -18,8 +19,7 @@ URL: https://virt-manager.org/ Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.xz Source1: symlinks -Patch1: virt-manager-Disable-spice.patch -Patch2: virt-manager-spec-update-link-to-virt-manager-sources.patch +Patch1: virt-manager-virtinst-cloudinit-include-empty-meta-data-file.patch Requires: virt-manager-common = %{verrel} @@ -27,6 +27,9 @@ Requires: python3-gobject >= 3.31.3 Requires: gtk3 >= 3.22.0 Requires: libvirt-glib >= 0.0.9 Requires: gtk-vnc2 +%if %{have_spice} +Requires: spice-gtk3 +%endif # virt-manager is one of those apps that people will often install onto # a headless machine for use over SSH. This means the virt-manager dep @@ -34,7 +37,12 @@ Requires: gtk-vnc2 # Unfortunately nothing in our chain has an explicit dep on some kind # of usable gsettings backend, so we explicitly depend on dconf so that # user settings actually persist across app runs. +# +# That said, we skip this dep for flatpak, where dconf isn't used in +# the runtime. gsettings defaults to ini file in that case +%if ! 0%{?flatpak} Requires: dconf +%endif # The vte291 package is actually the latest vte with API version 2.91, while # the vte3 package is effectively a compat package with API version 2.90. @@ -123,7 +131,7 @@ git commit -q -a --allow-empty --author 'rpm-build ' -m symlinks %build -%if 0%{?rhel} +%if ! %{have_spice} %global _default_graphics -Ddefault-graphics=vnc %endif @@ -152,7 +160,7 @@ git commit -q -a --allow-empty --author 'rpm-build ' -m symlinks %{_mandir}/man1/%{name}.1* -%{_datadir}/%{name}/ui/*.ui +%{_datadir}/%{name}/ui %{_datadir}/%{name}/virtManager %{_datadir}/%{name}/icons @@ -186,6 +194,11 @@ git commit -q -a --allow-empty --author 'rpm-build ' -m symlinks %changelog +* Sat Nov 15 2025 Pavel Hrdina - 5.1.0-1 +- Rebased to virt-manager-5.1.0 (RHEL-119340) +- The rebase also fixes the following bugs: + RHEL-105819 + * Mon Dec 2 2024 Pavel Hrdina - 5.0.0-1 - Rebased to virt-manager-5.0.0 (RHEL-34607) - The rebase also fixes the following bugs: