From 946c30ddbd584b4d9fba34c8648b097c5df5d229 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Wed, 27 Jan 2016 18:36:28 +0000
Subject: [PATCH] - bsc#963692 - libvirtError: unsupported configuration:
 unknown   driver format value 'block'   virtinst-xen-drive-type.patch -
 bsc#963173 - virt-manager - dependencies for VNC client are not   met on PPC 
  virt-manager.spec

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=293
---
 virt-manager.changes                 | 10 ++++++++++
 virt-manager.spec                    | 11 +++--------
 virtinst-xen-drive-type.patch        | 12 +++++++-----
 virtinst-xenbus-disk-index-fix.patch | 10 +++++-----
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/virt-manager.changes b/virt-manager.changes
index d7e90bfc..52cb36bf 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan 27 11:19:48 MST 2016 - carnold@suse.com
+
+- bsc#963692 - libvirtError: unsupported configuration: unknown
+  driver format value 'block'
+  virtinst-xen-drive-type.patch
+- bsc#963173 - virt-manager - dependencies for VNC client are not
+  met on PPC
+  virt-manager.spec
+
 -------------------------------------------------------------------
 Mon Jan 18 13:43:47 MST 2016 - carnold@suse.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index af22f09b..559d0eda 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -121,15 +121,10 @@ Requires:       python-ipaddr
 Requires:       python-libxml2
 Requires:       python-urlgrabber
 Requires:       typelib(LibvirtGLib)
-%if 0%{?is_opensuse}
 BuildRequires:  gobject-introspection
-%else
-Recommends:     typelib(AppIndicator3)
-Requires:       typelib(GVnc)
-Requires:       typelib(GtkVnc)
-Requires:       typelib(Libosinfo)
-Requires:       typelib(SpiceClientGtk)
-Requires:       typelib(Vte)
+# No AppIndicator package on SLE
+%if %{?is_opensuse:0}%{!?is_opensuse:1}
+Provides:       typelib(AppIndicator3)
 %endif
 
 %description common
diff --git a/virtinst-xen-drive-type.patch b/virtinst-xen-drive-type.patch
index 3a7e4d7a..f5da92cf 100644
--- a/virtinst-xen-drive-type.patch
+++ b/virtinst-xen-drive-type.patch
@@ -2,15 +2,17 @@ Reference: bnc#813082
 Virt-manager on Xen doesn't fill in any type thereby defaulting to
 'raw'. This patch will generate the correct XML on Xen.
 
-Index: virt-manager-1.3.0/virtinst/devicedisk.py
+Index: virt-manager-1.3.2/virtinst/devicedisk.py
 ===================================================================
---- virt-manager-1.3.0.orig/virtinst/devicedisk.py
-+++ virt-manager-1.3.0/virtinst/devicedisk.py
-@@ -557,6 +557,8 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.3.2.orig/virtinst/devicedisk.py
++++ virt-manager-1.3.2/virtinst/devicedisk.py
+@@ -557,6 +557,10 @@ class VirtualDisk(VirtualDevice):
          http://lists.gnu.org/archive/html/qemu-devel/2008-04/msg00675.html
          """
          if self.driver_name != self.DRIVER_NAME_QEMU:
-+            if self.driver_name and self.type != 'file':
++            if self.driver_name and \
++               self.driver_name != self.DRIVER_NAME_PHY and \
++               self.type != 'file':
 +                return self.type
              return None
  
diff --git a/virtinst-xenbus-disk-index-fix.patch b/virtinst-xenbus-disk-index-fix.patch
index c9ccf78d..eff10e73 100644
--- a/virtinst-xenbus-disk-index-fix.patch
+++ b/virtinst-xenbus-disk-index-fix.patch
@@ -6,11 +6,11 @@ types (ide vs xen) it added xvda with hda.  These disks were then
 passed to qemu where it error'ed out with the disks having the same
 index (in this case both are 0).
 
-Index: virt-manager-1.3.0/virtinst/devicedisk.py
+Index: virt-manager-1.3.2/virtinst/devicedisk.py
 ===================================================================
---- virt-manager-1.3.0.orig/virtinst/devicedisk.py
-+++ virt-manager-1.3.0/virtinst/devicedisk.py
-@@ -976,6 +976,17 @@ class VirtualDisk(VirtualDevice):
+--- virt-manager-1.3.2.orig/virtinst/devicedisk.py
++++ virt-manager-1.3.2/virtinst/devicedisk.py
+@@ -978,6 +978,17 @@ class VirtualDisk(VirtualDevice):
          @rtype C{str}
          """
          prefix, maxnode = self.get_target_prefix(skip_targets)
@@ -28,7 +28,7 @@ Index: virt-manager-1.3.0/virtinst/devicedisk.py
          skip_targets = [t for t in skip_targets if t and t.startswith(prefix)]
          skip_targets.sort()
  
-@@ -989,7 +1000,12 @@ class VirtualDisk(VirtualDevice):
+@@ -991,7 +1002,12 @@ class VirtualDisk(VirtualDevice):
                  ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
  
              for i in ran: