pool/virt-manager
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bsc#1191356 - virt-manager should not depend on gtk4

Browse Source 
Modified files:
    virt-manager.spec
    virtman-dont-specify-gtksource-version.patch
    virtman-dont-specify-vte-version.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=548
This commit is contained in:
Charles Arnold 2021-10-07 20:57:07 +00:00 committed by Git OBS Bridge
parent 443cf65c8c
commit 806560bdca
4 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
virt-manager.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Oct 7 14:53:51 MDT 2021 - carnold@suse.com
- bsc#1191356 - virt-manager should not depend on gtk4
Modified files:
virt-manager.spec
virtman-dont-specify-gtksource-version.patch
virtman-dont-specify-vte-version.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 4 15:58:01 MDT 2021 - carnold@suse.com Mon Oct 4 15:58:01 MDT 2021 - carnold@suse.com

16
virt-manager.spec
View File

@ -94,31 +94,23 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define verrel %{version}-%{release} %define verrel %{version}-%{release}
Requires: dbus-1-x11 Requires: dbus-1-x11
Requires: dconf Requires: dconf
Requires: gtk3 >= 3.22 Requires: gtk3
Requires: python3-gobject-Gdk Requires: python3-gobject
# For console widget # For console widget
Requires: python3-cairo Requires: python3-cairo
Requires: python3-gobject-cairo Requires: python3-gobject-cairo
Recommends: python3-SpiceClientGtk Recommends: python3-SpiceClientGtk
Requires: gtksourceview >= 3
Requires: virt-install Requires: virt-install
Requires: virt-manager-common = %{verrel} Requires: virt-manager-common = %{verrel}
Requires: typelib(GtkSource)
%if %{with_guestfs} %if %{with_guestfs}
Requires: python3-libguestfs Requires: python3-libguestfs
%endif %endif
BuildRequires: glib2-devel BuildRequires: gettext
BuildRequires: gtk3-tools
BuildRequires: intltool
BuildRequires: perl
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-docutils BuildRequires: python3-docutils
BuildRequires: python3-gobject
BuildRequires: python3-libvirt-python >= 0.7.0
BuildRequires: python3-libxml2-python
BuildRequires: python3-requests
BuildRequires: typelib(Libosinfo)
%description %description
Virtual Machine Manager provides a graphical tool for administering virtual Virtual Machine Manager provides a graphical tool for administering virtual

15
virtman-dont-specify-gtksource-version.patch
View File

@ -1,8 +1,8 @@
Index: virt-manager-3.0.0/virtManager/xmleditor.py Index: virt-manager-3.2.0/virtManager/xmleditor.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtManager/xmleditor.py --- virt-manager-3.2.0.orig/virtManager/xmleditor.py
+++ virt-manager-3.0.0/virtManager/xmleditor.py +++ virt-manager-3.2.0/virtManager/xmleditor.py
@@ -7,12 +7,12 @@ import gi @@ -7,12 +7,7 @@ import gi
from virtinst import log from virtinst import log
# We can use either gtksourceview3 or gtksourceview4 # We can use either gtksourceview3 or gtksourceview4
@ -12,12 +12,7 @@ Index: virt-manager-3.0.0/virtManager/xmleditor.py
-except ValueError: # pragma: no cover -except ValueError: # pragma: no cover
- gi.require_version("GtkSource", "3.0") - gi.require_version("GtkSource", "3.0")
- log.debug("Using GtkSource 3.0") - log.debug("Using GtkSource 3.0")
+#try: +gi.require_version("GtkSource", "3.0")
+# gi.require_version("GtkSource", "4")
+# log.debug("Using GtkSource 4")
+#except ValueError: # pragma: no cover
+# gi.require_version("GtkSource", "3.0")
+# log.debug("Using GtkSource 3.0")
from gi.repository import GtkSource from gi.repository import GtkSource
from .lib import uiutil from .lib import uiutil

15
virtman-dont-specify-vte-version.patch
View File

@ -2,11 +2,11 @@ Creates a problem for gobject-introspection identifying what
version of vte is really allowed. Vte 2.91 is installed on the version of vte is really allowed. Vte 2.91 is installed on the
host but the RPM is built requiring 2.90. host but the RPM is built requiring 2.90.
Index: virt-manager-3.0.0/virtManager/details/serialcon.py Index: virt-manager-3.2.0/virtManager/details/serialcon.py
=================================================================== ===================================================================
--- virt-manager-3.0.0.orig/virtManager/details/serialcon.py --- virt-manager-3.2.0.orig/virtManager/details/serialcon.py
+++ virt-manager-3.0.0/virtManager/details/serialcon.py +++ virt-manager-3.2.0/virtManager/details/serialcon.py
@@ -12,12 +12,12 @@ from gi.repository import Gtk @@ -12,12 +12,7 @@ from gi.repository import Gtk
from virtinst import log from virtinst import log
# We can use either 2.91 or 2.90. This is just to silence runtime warnings # We can use either 2.91 or 2.90. This is just to silence runtime warnings
@ -16,12 +16,7 @@ Index: virt-manager-3.0.0/virtManager/details/serialcon.py
-except ValueError: # pragma: no cover -except ValueError: # pragma: no cover
- gi.require_version("Vte", "2.90") - gi.require_version("Vte", "2.90")
- log.debug("Using VTE API 2.90") - log.debug("Using VTE API 2.90")
+#try: +gi.require_version("Vte", "2.91")
+# gi.require_version("Vte", "2.91")
+# log.debug("Using VTE API 2.91")
+#except ValueError: # pragma: no cover
+# gi.require_version("Vte", "2.90")
+# log.debug("Using VTE API 2.90")
from gi.repository import Vte from gi.repository import Vte
import libvirt import libvirt