- bsc#944374 - virt-manager uninstallable on aarch64

virt-manager.spec
- Add upstream bug fix
  5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=254

5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch

@@ -0,0 +1,68 @@
+Subject: guest: Don't try to set vmport on non-x86, it isn't supported (bz 1259998)
+From: Cole Robinson crobinso@redhat.com Fri Sep 4 12:14:22 2015 -0400
+Date: Fri Sep 4 12:14:22 2015 -0400:
+Git: 5e68b0fc3d9b93491817a3c1914fa9b3633440b6
+
+
+Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
+===================================================================
+--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
++++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-machdefault-f20.xml
+@@ -8,12 +8,6 @@
+     <type arch="ppc64" machine="pseries">hvm</type>
+     <boot dev="network"/>
+   </os>
+-  <features>
+-    <acpi/>
+-    <apic/>
+-    <pae/>
+-    <vmport state="off"/>
+-  </features>
+   <clock offset="utc"/>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
+===================================================================
+--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
++++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64-pseries-f20.xml
+@@ -8,12 +8,6 @@
+     <type arch="ppc64" machine="pseries">hvm</type>
+     <boot dev="network"/>
+   </os>
+-  <features>
+-    <acpi/>
+-    <apic/>
+-    <pae/>
+-    <vmport state="off"/>
+-  </features>
+   <clock offset="utc"/>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+Index: virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
+===================================================================
+--- virt-manager-1.2.1.orig/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
++++ virt-manager-1.2.1/tests/cli-test-xml/compare/virt-install-ppc64le-kvm-import.xml
+@@ -8,11 +8,6 @@
+     <type arch="ppc64le" machine="pseries">hvm</type>
+     <boot dev="hd"/>
+   </os>
+-  <features>
+-    <acpi/>
+-    <apic/>
+-    <vmport state="off"/>
+-  </features>
+   <clock offset="utc"/>
+   <on_poweroff>destroy</on_poweroff>
+   <on_reboot>restart</on_reboot>
+Index: virt-manager-1.2.1/virtinst/guest.py
+===================================================================
+--- virt-manager-1.2.1.orig/virtinst/guest.py
++++ virt-manager-1.2.1/virtinst/guest.py
+@@ -847,6 +847,7 @@ class Guest(XMLBuilder):
+             self.features.pae = self.conn.caps.supports_pae()
+ 
+         if (self.features.vmport == "default" and
++            self.os.is_x86() and
+             self.has_spice() and
+             self.conn.check_support(self.conn.SUPPORT_CONN_VMPORT)):
+             self.features.vmport = False

virt-manager.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  3 10:43:15 MDT 2015 - carnold@suse.com
+
+- bsc#944374 - virt-manager uninstallable on aarch64
+  virt-manager.spec
+- Add upstream bug fix
+  5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch
+
 -------------------------------------------------------------------
 Mon Aug 31 16:41:28 MDT 2015 - carnold@suse.com
 

virt-manager.spec

@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define with_guestfs       0
 %define askpass_package    "openssh-askpass"
 %define qemu_user          "qemu"
@@ -45,6 +46,7 @@ Patch6:         f81358b0-dont-display-error-if-machine-is-missing-in-XML.patch
 Patch7:         aebebbf8-report-an-error-for-pxe-install-without-network.patch
 Patch8:         4970615f-fix-qemu-vs-lxc-detection.patch
 Patch9:         eb92178e-virtinst-fix-storage-pool-lookup.patch
+Patch10:        5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch
 # SUSE Only
 Patch70:        virtman-desktop.patch
 Patch71:        virtman-kvm.patch
@@ -95,7 +97,7 @@ Requires:       dconf
 Requires:       gtk3
 Requires:       python-gconf
 Requires:       virt-manager-common = %{verrel}
-Requires:       vm-install >= 0.5.6
+Recommends:     vm-install >= 0.5.6
 
 # Typelib's
 Recommends:     typelib(AppIndicator3)
@@ -179,6 +181,7 @@ machine).
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 # SUSE Only
 %patch70 -p1
 %patch71 -p1

virtman-add-s390x-arch-support.patch

@@ -75,7 +75,7 @@ Index: virt-manager-1.2.1/virtinst/guest.py
              return
          self.add_device(VirtualGraphics(self.conn))
  
-@@ -956,7 +961,7 @@ class Guest(XMLBuilder):
+@@ -957,7 +962,7 @@ class Guest(XMLBuilder):
          if self._hv_only_supports_virtio():
              return True