diff --git a/virt-manager.changes b/virt-manager.changes index fa9ecd4d..d7611488 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -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 diff --git a/virt-manager.spec b/virt-manager.spec index 0a0e2d10..909c8b6d 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -94,31 +94,23 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define verrel %{version}-%{release} Requires: dbus-1-x11 Requires: dconf -Requires: gtk3 >= 3.22 -Requires: python3-gobject-Gdk +Requires: gtk3 +Requires: python3-gobject # For console widget Requires: python3-cairo Requires: python3-gobject-cairo Recommends: python3-SpiceClientGtk -Requires: gtksourceview >= 3 Requires: virt-install Requires: virt-manager-common = %{verrel} +Requires: typelib(GtkSource) %if %{with_guestfs} Requires: python3-libguestfs %endif -BuildRequires: glib2-devel -BuildRequires: gtk3-tools -BuildRequires: intltool -BuildRequires: perl +BuildRequires: gettext BuildRequires: python3-devel BuildRequires: python3-docutils -BuildRequires: python3-gobject -BuildRequires: python3-libvirt-python >= 0.7.0 -BuildRequires: python3-libxml2-python -BuildRequires: python3-requests -BuildRequires: typelib(Libosinfo) %description Virtual Machine Manager provides a graphical tool for administering virtual diff --git a/virtman-dont-specify-gtksource-version.patch b/virtman-dont-specify-gtksource-version.patch index f753e1e8..b530963b 100644 --- a/virtman-dont-specify-gtksource-version.patch +++ b/virtman-dont-specify-gtksource-version.patch @@ -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.0.0/virtManager/xmleditor.py -@@ -7,12 +7,12 @@ import gi +--- virt-manager-3.2.0.orig/virtManager/xmleditor.py ++++ virt-manager-3.2.0/virtManager/xmleditor.py +@@ -7,12 +7,7 @@ import gi from virtinst import log # 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 - gi.require_version("GtkSource", "3.0") - log.debug("Using GtkSource 3.0") -+#try: -+# 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") ++gi.require_version("GtkSource", "3.0") from gi.repository import GtkSource from .lib import uiutil diff --git a/virtman-dont-specify-vte-version.patch b/virtman-dont-specify-vte-version.patch index 2d27c230..ed299de1 100644 --- a/virtman-dont-specify-vte-version.patch +++ b/virtman-dont-specify-vte-version.patch @@ -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 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.0.0/virtManager/details/serialcon.py -@@ -12,12 +12,12 @@ from gi.repository import Gtk +--- virt-manager-3.2.0.orig/virtManager/details/serialcon.py ++++ virt-manager-3.2.0/virtManager/details/serialcon.py +@@ -12,12 +12,7 @@ from gi.repository import Gtk from virtinst import log # 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 - gi.require_version("Vte", "2.90") - log.debug("Using VTE API 2.90") -+#try: -+# 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") ++gi.require_version("Vte", "2.91") from gi.repository import Vte import libvirt