- Replace virtinst-uefi-loader-suse-regex.patch with upstream

1c221fd0-suse-ovmf-paths.patch

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

1c221fd0-suse-ovmf-paths.patch

@@ -1,20 +1,23 @@
-Support paths to SUSE OVMF firmwares
+commit 1c221fd0349b993e8ee2eabbf227239d6e989d90
+Author: Jim Fehlig <jfehlig@suse.com>
+Date:   Wed Jan 27 19:51:32 2016 -0700
 
-Extend the domcapabilities regex to include SUSE's OVMF
-file naming convention.
-
-bsc#961853
+    virtinst: Support paths to SUSE OVMF firmwares
+    
+    Extend the domcapabilities regex to include SUSE's OVMF
+    file naming convention.
+    
+    Signed-off-by: Jim Fehlig <jfehlig@suse.com>
 
 Index: virt-manager-1.3.2/virtinst/domcapabilities.py
 ===================================================================
 --- virt-manager-1.3.2.orig/virtinst/domcapabilities.py
 +++ virt-manager-1.3.2/virtinst/domcapabilities.py
-@@ -101,6 +101,8 @@ class DomainCapabilities(XMLBuilder):
+@@ -101,6 +101,7 @@ class DomainCapabilities(XMLBuilder):
          "x86_64": [
              ".*OVMF_CODE\.fd",  # RHEL
              ".*ovmf-x64/OVMF.*\.fd",  # gerd's firmware repo
 +            ".*ovmf-x86_64-.*", # SUSE
-+
          ],
          "aarch64": [
              ".*AAVMF_CODE\.fd",  # RHEL

virt-manager.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 29 16:44:17 UTC 2016 - jfehlig@suse.com
+
+- Replace virtinst-uefi-loader-suse-regex.patch with upstream
+  1c221fd0-suse-ovmf-paths.patch
+
 -------------------------------------------------------------------
 Thu Jan 28 00:19:31 UTC 2016 - jfehlig@suse.com
 

virt-manager.spec

@@ -39,6 +39,7 @@ Source2:        virt-install.desktop
 # Upstream Patches
 Patch1:         89c3638b-fix-detection-that-libvirtd-is-stopped.patch
 Patch2:         eae7dc06-fix-URL-installs-when-content-length-header-missing.patch
+Patch3:         1c221fd0-suse-ovmf-paths.patch
 # SUSE Only
 Patch70:        virtman-desktop.patch
 Patch71:        virtman-kvm.patch
@@ -48,7 +49,6 @@ Patch74:        virtman-libvirtd-not-running.patch
 Patch75:        virtman-dont-allow-grub.xen-to-be-deleted.patch
 Patch76:        virtinst-pvgrub2-bootloader.patch
 Patch77:        virtinst-nfs-install-sanitize.patch
-Patch78:        virtinst-uefi-loader-suse-regex.patch
 # Features or Enhancements
 Patch100:       virtman-eepro100.patch
 Patch101:       virtman-default-guest-from-host-os.patch
@@ -157,6 +157,7 @@ machine).
 # Upstream Patches
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # SUSE Only
 %patch70 -p1
 %patch71 -p1
@@ -166,7 +167,6 @@ machine).
 %patch75 -p1
 %patch76 -p1
 %patch77 -p1
-%patch78 -p1
 # Enhancements
 %patch100 -p1
 %patch101 -p1