- bsc#945832 - virt-manager is missing a dependency on

typelib-1_0-LibvirtGLib-1_0
  virt-manager.spec

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=267
This commit is contained in:
Charles Arnold 2015-09-16 16:04:33 +00:00 committed by Git OBS Bridge
parent 11f8556f5e
commit 302fdef16f
5 changed files with 21 additions and 14 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 16 10:01:56 MDT 2015 - carnold@suse.com
- bsc#945832 - virt-manager is missing a dependency on
typelib-1_0-LibvirtGLib-1_0
virt-manager.spec
-------------------------------------------------------------------
Tue Sep 15 02:21:36 UTC 2015 - cyliu@suse.com

View File

@ -133,6 +133,7 @@ Requires: libvirt-python >= 0.7.0
Requires: python-ipaddr
Requires: python-libxml2
Requires: python-urlgrabber
Requires: typelib(LibvirtGLib)
%if 0%{?is_opensuse}
BuildRequires: gobject-introspection
%else
@ -140,7 +141,6 @@ Recommends: typelib(AppIndicator3)
Requires: typelib(GVnc)
Requires: typelib(GtkVnc)
Requires: typelib(Libosinfo)
Requires: typelib(LibvirtGLib)
Requires: typelib(SpiceClientGtk)
Requires: typelib(Vte)
%endif

View File

@ -4,7 +4,7 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
+++ virt-manager-1.2.1/virtinst/urlfetcher.py
@@ -373,6 +373,10 @@ def _distroFromSUSEContent(fetcher, arch
@@ -374,6 +374,10 @@ def _distroFromSUSEContent(fetcher, arch
arch = "i586"
elif cbuf.find("s390x") != -1:
arch = "s390x"
@ -15,7 +15,7 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
dclass = GenericDistro
if distribution:
@@ -942,10 +946,12 @@ class SuseDistro(Distro):
@@ -943,10 +947,12 @@ class SuseDistro(Distro):
oldkern += "64"
oldinit += "64"

View File

@ -4,7 +4,7 @@ Index: virt-manager-1.2.1/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
+++ virt-manager-1.2.1/virtinst/urlfetcher.py
@@ -385,6 +385,10 @@ def _distroFromSUSEContent(fetcher, arch
@@ -386,6 +386,10 @@ def _distroFromSUSEContent(fetcher, arch
dclass = SLEDDistro
if distro_version is None:
distro_version = ['VERSION', distribution[1].strip().rsplit(' ')[4]]

View File

@ -5,10 +5,10 @@ A fix for accessing nfs mounted media. A comment in the code states,
and carry the latter form around internally"
We need the RFC version to work correctly whereas redhat's anaconda
needs their own modified version.
Index: virt-manager-1.2.0/virtinst/util.py
Index: virt-manager-1.2.1/virtinst/util.py
===================================================================
--- virt-manager-1.2.0.orig/virtinst/util.py
+++ virt-manager-1.2.0/virtinst/util.py
--- virt-manager-1.2.1.orig/virtinst/util.py
+++ virt-manager-1.2.1/virtinst/util.py
@@ -559,3 +559,22 @@ def getInstallRepos(enabled_sources_only
zypper_output.insert(0, dom0_inst_source)
return (index_dom0, zypper_output)
@ -32,10 +32,10 @@ Index: virt-manager-1.2.0/virtinst/util.py
+
+ return url
+
Index: virt-manager-1.2.0/virtinst/distroinstaller.py
Index: virt-manager-1.2.1/virtinst/distroinstaller.py
===================================================================
--- virt-manager-1.2.0.orig/virtinst/distroinstaller.py
+++ virt-manager-1.2.0/virtinst/distroinstaller.py
--- virt-manager-1.2.1.orig/virtinst/distroinstaller.py
+++ virt-manager-1.2.1/virtinst/distroinstaller.py
@@ -51,6 +51,8 @@ def _sanitize_url(url):
"""
Do nothing for http or ftp, but make sure nfs is in the expected format
@ -45,10 +45,10 @@ Index: virt-manager-1.2.0/virtinst/distroinstaller.py
if url.startswith("nfs://"):
# Convert RFC compliant NFS nfs://server/path/to/distro
# to what mount/anaconda expect nfs:server:/path/to/distro
Index: virt-manager-1.2.0/virtinst/urlfetcher.py
Index: virt-manager-1.2.1/virtinst/urlfetcher.py
===================================================================
--- virt-manager-1.2.0.orig/virtinst/urlfetcher.py
+++ virt-manager-1.2.0/virtinst/urlfetcher.py
--- virt-manager-1.2.1.orig/virtinst/urlfetcher.py
+++ virt-manager-1.2.1/virtinst/urlfetcher.py
@@ -33,6 +33,7 @@ import urlparse
import urlgrabber.grabber as grabber
@ -57,7 +57,7 @@ Index: virt-manager-1.2.0/virtinst/urlfetcher.py
#########################################################################
@@ -218,7 +219,8 @@ class _MountedImageFetcher(_LocalImageFe
@@ -219,7 +220,8 @@ class _MountedImageFetcher(_LocalImageFe
logging.debug("Preparing mount at " + self.srcdir)
if self.location.startswith("nfs:"):