virt-manager-1.5.0-1.parabola1: updating version

2 files changed, 22 insertions, 14 deletions

diff --git a/libre/virt-manager/PKGBUILD b/libre/virt-manager/PKGBUILD
index 85ac437b0..8814fe661 100644
--- a/libre/virt-manager/PKGBUILD
+++ b/libre/virt-manager/PKGBUILD
@@ -7,8 +7,8 @@
 
 pkgbase=virt-manager
 pkgname=virt-install
-pkgver=1.4.3
-pkgrel=2.parabola1
+pkgver=1.5.0
+pkgrel=1.parabola1
 pkgdesc="Console user interface for managing virtual machines, without non-FSDG compliant distros and operating systems support"
 arch=('any')
 url="http://virt-manager.org/"
@@ -18,8 +18,8 @@ depends=('python2-gobject' 'libvirt-glib' 'libvirt-python2'
 makedepends=('intltool' 'python2-cairo')
 source=("https://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz"
         'libre.patch')
-sha256sums=('528226b9a0fdd6cd66451a8217fc7c87f3deb6bebd08599c25fe5c7291fe6a24'
-            'a96c04329a32c2e652fc7f3f21ec21ce649b2500e65911c9272c7fa340f6d938')
+sha512sums=('b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da'
+            'd1ae2affc590921375f4b0ffd3e412032b2d98e63056df0546eff53b7706e3b5aeaaf2d1ba6fa6dcc86bc514404df30b06cc4495a73a37b824184f0ba3a2fc81')
 
 prepare() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/libre/virt-manager/libre.patch b/libre/virt-manager/libre.patch
index 70a822bd0..fe8e052a6 100644
--- a/libre/virt-manager/libre.patch
+++ b/libre/virt-manager/libre.patch
@@ -818,9 +818,9 @@
          return None
  
      def get_recommended_resources(self, guest):
---- virt-manager-1.4.2.orig/virtinst/urlfetcher.py	2017-08-02 12:57:43.000000000 -0500
-+++ virt-manager-1.4.2/virtinst/urlfetcher.py	2017-08-15 01:50:32.319461427 -0500
-@@ -384,96 +384,6 @@
+--- virt-manager-1.5.0.orig/virtinst/urlfetcher.py	2018-01-27 15:57:20.000000000 -0500
++++ virt-manager-1.5.0/virtinst/urlfetcher.py	2018-02-15 22:07:10.133800027 -0500
+@@ -408,96 +408,6 @@
      return treeinfo
  
  
@@ -888,7 +888,7 @@
 -    dclass = GenericDistro
 -    if distribution:
 -        if re.match(".*SUSE Linux Enterprise Server*", distribution[1]) or \
--            re.match(".*SUSE SLES*", distribution[1]):
+-                re.match(".*SUSE SLES*", distribution[1]):
 -            dclass = SLESDistro
 -            if distro_version is None:
 -                distro_version = _parse_sle_distribution(distribution)
@@ -917,7 +917,7 @@
  def getDistroStore(guest, fetcher):
      stores = []
      logging.debug("Finding distro store for location=%s", fetcher.location)
-@@ -764,589 +674,6 @@
+@@ -788,597 +698,6 @@
          return self.fetcher.acquireFile(self._valid_iso_path)
  
  
@@ -1265,7 +1265,7 @@
 -
 -        # Check for standard 'i386' and 'amd64' which will be
 -        # in the URI name for --location $ISO mounts
--        for arch in ["i386", "amd64", "x86_64"]:
+-        for arch in ["i386", "amd64", "x86_64", "arm64"]:
 -            if arch in self.uri:
 -                logging.debug("Found treearch=%s in uri", arch)
 -                if arch == "x86_64":
@@ -1354,9 +1354,17 @@
 -            return False
 -
 -        if self.arch == "x86_64":
--            kernel_initrd_pair = ("install.amd/vmlinuz", "install.amd/initrd.gz")
+-            kernel_initrd_pair = ("install.amd/vmlinuz",
+-                                  "install.amd/initrd.gz")
 -        elif self.arch == "i686":
--            kernel_initrd_pair = ("install.386/vmlinuz", "install.386/initrd.gz")
+-            kernel_initrd_pair = ("install.386/vmlinuz",
+-                                  "install.386/initrd.gz")
+-        elif self.arch == "aarch64":
+-            kernel_initrd_pair = ("install.a64/vmlinuz",
+-                                  "install.a64/initrd.gz")
+-        elif self.arch == "ppc64le":
+-            kernel_initrd_pair = ("install/vmlinux",
+-                                  "install/initrd.gz")
 -        elif self.arch == "s390x":
 -            kernel_initrd_pair = ("boot/linux_vm", "boot/root.bin")
 -        else:
@@ -1427,7 +1435,7 @@
 -            return False
 -
 -        if not self.arch == "s390x":
--            kernel_initrd_pair = ("linux", "initrd.gz")
+-            kernel_initrd_pair = ("install/vmlinuz", "install/initrd.gz")
 -        else:
 -            kernel_initrd_pair = ("boot/kernel.ubuntu", "boot/initrd.ubuntu")
 -
@@ -1497,7 +1505,7 @@
 -        if not self.fetcher.hasFile(".disk/info"):
 -            return False
 -
--        if self._fetchAndMatchRegex(".disk/info", ".*%s.*" % self.name):
+-        if self._fetchAndMatchRegex(".disk/info", ".*ALT .*"):
 -            return True
 -
 -        logging.debug("Regex didn't match, not a %s distro", self.name)