virt-manager-5.1.0-1.el10
- Rebased to virt-manager-5.1.0 (RHEL-119228)
- The rebase also fixes the following bugs:
RHEL-105818
Resolves: RHEL-105818, RHEL-119228
This commit is contained in:
Pavel Hrdina
parent
daf818f014
commit
f580cee75e
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/virt-manager-*.tar.gz
|
||||
/virt-manager-20220220-git363fca41.tar.xz
|
||||
/virt-manager-5.0.0.tar.xz
|
||||
/virt-manager-5.1.0.tar.xz
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (virt-manager-5.0.0.tar.xz) = d0cb7eb844fc98ad29413717e5fa5834bc6f9f6cb6b9339b59c2721bb37a58f71280e3d2a04a64a6021614626329d76c92474f826bb1d9b7a9040b479f20d4e8
|
||||
SHA512 (virt-manager-5.1.0.tar.xz) = 6306500ae442a6ccb36d5f19bc26b0e32984ca145ee8d41a475e175ee4db6c0d253f0cf9d908c30e3269cf7aabdad4bbd30e84f3cd0477f233da1e43e0235e3c
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
From 35127dbaac817e9d78aaa6a97021eb9b18d63b12 Mon Sep 17 00:00:00 2001
|
||||
Message-ID: <35127dbaac817e9d78aaa6a97021eb9b18d63b12.1733152262.git.phrdina@redhat.com>
|
||||
From: Pavel Hrdina <phrdina@redhat.com>
|
||||
Date: Fri, 29 Nov 2024 20:48:04 +0100
|
||||
Subject: [PATCH] Downstream changes to RPM spec file
|
||||
|
||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||||
---
|
||||
virt-manager.spec.in | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/virt-manager.spec.in b/virt-manager.spec.in
|
||||
index c22ed32b5..353491111 100644
|
||||
--- a/virt-manager.spec.in
|
||||
+++ b/virt-manager.spec.in
|
||||
@@ -23,7 +23,9 @@ Requires: python3-gobject >= 3.31.3
|
||||
Requires: gtk3 >= 3.22.0
|
||||
Requires: libvirt-glib >= 0.0.9
|
||||
Requires: gtk-vnc2
|
||||
+%if 0%{?fedora}
|
||||
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
|
||||
@@ -104,8 +106,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
|
||||
@ -1,28 +0,0 @@
|
||||
From d399e1504f45aa02eb70347a038c1410890db9c4 Mon Sep 17 00:00:00 2001
|
||||
Message-ID: <d399e1504f45aa02eb70347a038c1410890db9c4.1733152262.git.phrdina@redhat.com>
|
||||
From: Pavel Hrdina <phrdina@redhat.com>
|
||||
Date: Fri, 29 Nov 2024 20:59:27 +0100
|
||||
Subject: [PATCH] spec: update link to virt-manager sources
|
||||
|
||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||||
(cherry picked from commit b74730ebb6556dcbcc3b4e4993c79304c309cab4)
|
||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||||
---
|
||||
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 353491111..0ffdf577c 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
|
||||
@ -0,0 +1,35 @@
|
||||
From a6c6c71eb05eb5caca188bd9c7f5db4fb25493ea Mon Sep 17 00:00:00 2001
|
||||
Message-ID: <a6c6c71eb05eb5caca188bd9c7f5db4fb25493ea.1763226402.git.phrdina@redhat.com>
|
||||
From: Pavel Hrdina <phrdina@redhat.com>
|
||||
Date: Mon, 29 Sep 2025 16:14:35 +0200
|
||||
Subject: [PATCH] virtinst: cloudinit: include empty meta-data file
|
||||
|
||||
From: Pavel Hrdina <phrdina@redhat.com>
|
||||
|
||||
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 <phrdina@redhat.com>
|
||||
(cherry picked from commit ea71cf9a8a4161ce6e19eacf5f0d86d40ab74f23)
|
||||
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
||||
---
|
||||
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
|
||||
@ -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-Downstream-changes-to-RPM-spec-file.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,7 +27,7 @@ Requires: python3-gobject >= 3.31.3
|
||||
Requires: gtk3 >= 3.22.0
|
||||
Requires: libvirt-glib >= 0.0.9
|
||||
Requires: gtk-vnc2
|
||||
%if 0%{?fedora}
|
||||
%if %{have_spice}
|
||||
Requires: spice-gtk3
|
||||
%endif
|
||||
|
||||
@ -37,7 +37,12 @@ Requires: spice-gtk3
|
||||
# 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.
|
||||
@ -126,7 +131,7 @@ git commit -q -a --allow-empty --author 'rpm-build <rpm-build>' -m symlinks
|
||||
|
||||
|
||||
%build
|
||||
%if 0%{?rhel}
|
||||
%if ! %{have_spice}
|
||||
%global _default_graphics -Ddefault-graphics=vnc
|
||||
%endif
|
||||
|
||||
@ -155,7 +160,7 @@ git commit -q -a --allow-empty --author 'rpm-build <rpm-build>' -m symlinks
|
||||
|
||||
%{_mandir}/man1/%{name}.1*
|
||||
|
||||
%{_datadir}/%{name}/ui/*.ui
|
||||
%{_datadir}/%{name}/ui
|
||||
%{_datadir}/%{name}/virtManager
|
||||
|
||||
%{_datadir}/%{name}/icons
|
||||
@ -189,6 +194,11 @@ git commit -q -a --allow-empty --author 'rpm-build <rpm-build>' -m symlinks
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Nov 15 2025 Pavel Hrdina <phrdina@redhat.com> - 5.1.0-1
|
||||
- Rebased to virt-manager-5.1.0 (RHEL-119228)
|
||||
- The rebase also fixes the following bugs:
|
||||
RHEL-105818
|
||||
|
||||
* Mon Dec 2 2024 Pavel Hrdina <phrdina@redhat.com> - 5.0.0-1
|
||||
- Rebased to virt-manager-5.0.0 (RHEL-46783)
|
||||
- The rebase also fixes the following bugs:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user