From 2aaede282e64ec3065f37821b4d1891c9e1bbc21 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Mon, 3 Feb 2014 20:40:38 +0000 Subject: [PATCH] - Fix patch using util.is_error_nosupport (0.10.1) when it should be using support.is_error_nosupport (0.10.0) added Base-mem-statistics-on-virDomainMemoryStats-if-avail.patch - Add Requires on virt-manager for virt-install OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=140 --- ...istics-on-virDomainMemoryStats-if-avail.patch | 2 +- virt-manager.changes | 9 ++++++++- virt-manager.spec | 16 ++++++++-------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Base-mem-statistics-on-virDomainMemoryStats-if-avail.patch b/Base-mem-statistics-on-virDomainMemoryStats-if-avail.patch index 494dbd7c..9b882acc 100644 --- a/Base-mem-statistics-on-virDomainMemoryStats-if-avail.patch +++ b/Base-mem-statistics-on-virDomainMemoryStats-if-avail.patch @@ -44,7 +44,7 @@ Index: virt-manager-0.10.0/virtManager/domain.py + curmem = stats['rss'] + totalmem = stats['actual'] + except libvirt.libvirtError, err: -+ if util.is_error_nosupport(err): ++ if support.is_error_nosupport(err): + logging.debug("Mem stats not supported: %s", err) + self._mem_stats_supported = False + else: diff --git a/virt-manager.changes b/virt-manager.changes index 110d8914..c9f5f286 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 3 13:36:52 MST 2014 - carnold@suse.com + +- Fix patch using util.is_error_nosupport (0.10.1) when it should + be using support.is_error_nosupport (0.10.0) + added Base-mem-statistics-on-virDomainMemoryStats-if-avail.patch + ------------------------------------------------------------------- Wed Jan 23 18:00:00 CET 2014 - tbehrens@suse.com @@ -9,7 +16,7 @@ Wed Jan 23 18:00:00 CET 2014 - tbehrens@suse.com ------------------------------------------------------------------- Wed Jan 22 11:03:50 MST 2014 - carnold@suse.com -- Add Requires on virt-manager for virt-install +- Add Requires on virt-manager for virt-install - Add sles12/sled12 as supported distros ------------------------------------------------------------------- diff --git a/virt-manager.spec b/virt-manager.spec index 60977075..ee32da60 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -71,9 +71,9 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define verrel %{version}-%{release} -Requires: virt-manager-common = %{verrel} Requires: gtk3 Requires: python-gconf +Requires: virt-manager-common = %{verrel} Requires: vm-install >= 0.5.6 # Libvirt-glib @@ -88,11 +88,11 @@ Requires: typelib-1_0-Vte-2_90 Requires: gtk-vnc2 Requires: libspice-client-glib-2_0-8 Requires: libspice-client-gtk-3_0-4 +Requires: typelib-1_0-GVnc-1_0 +Requires: typelib-1_0-Gtk-3_0 +Requires: typelib-1_0-GtkVnc-2_0 Requires: typelib-1_0-SpiceClientGlib-2_0 Requires: typelib-1_0-SpiceClientGtk-3_0 -Requires: typelib-1_0-Gtk-3_0 -Requires: typelib-1_0-GVnc-1_0 -Requires: typelib-1_0-GtkVnc-2_0 Recommends: python-SpiceClientGtk Requires: virt-install @@ -121,8 +121,8 @@ Group: System/Monitoring # This version not strictly required: virt-manager should work with older, # however varying amounts of functionality will not be enabled. Requires: libvirt-python >= 0.7.0 -Requires: python-urlgrabber Requires: python-ipaddr +Requires: python-urlgrabber %description common Common files used by the different virt-manager interfaces, as well as @@ -135,10 +135,10 @@ Group: System/Monitoring Requires: virt-manager-common = %{verrel} -Provides: virt-clone -Provides: virt-image -Provides: virt-convert Provides: python-virtinst +Provides: virt-clone +Provides: virt-convert +Provides: virt-image Obsoletes: python-virtinst <= 0.600.4 %description -n virt-install