Hello community,
here is the log from the commit of package virt-manager for openSUSE:Factory
checked in at 2017-09-15 22:31:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/virt-manager (Old)
and /work/SRC/openSUSE:Factory/.virt-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "virt-manager"
Fri Sep 15 22:31:18 2017 rev:155 rq:526207 version:1.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/virt-manager/virt-manager.changes
2017-08-28 15:18:22.994456837 +0200
+++ /work/SRC/openSUSE:Factory/.virt-manager.new/virt-manager.changes
2017-09-15 22:31:18.855440695 +0200
@@ -1,0 +2,13 @@
+Thu Sep 14 11:51:22 MDT 2017 - carn...@suse.com
+
+- bsc#1058666 - virt-manager has a dependency on
+ typelib(AppIndicator3) = 0.1
+ virt-manager.spec
+
+-------------------------------------------------------------------
+Tue Aug 29 15:47:17 MDT 2017 - carn...@suse.com
+
+- bsc#1056028 - Not able to install OES2018 as guest on Xen
+ virtinst-detect-oes-distros.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.5015Ut/_old 2017-09-15 22:31:21.487069993 +0200
+++ /var/tmp/diff_new_pack.5015Ut/_new 2017-09-15 22:31:21.491069429 +0200
@@ -132,7 +132,7 @@
Requires: typelib(LibvirtGLib)
BuildRequires: gobject-introspection
# No AppIndicator package on SLE
-%if %{?is_opensuse:0}%{!?is_opensuse:1}
+%if 0%{?is_opensuse} == 0
%define __requires_exclude typelib\\(AppIndicator3\\)
%endif
++++++ virtinst-add-caasp-support.patch ++++++
--- /var/tmp/diff_new_pack.5015Ut/_old 2017-09-15 22:31:21.643048022 +0200
+++ /var/tmp/diff_new_pack.5015Ut/_new 2017-09-15 22:31:21.647047458 +0200
@@ -5,9 +5,9 @@
--- virt-manager-1.4.2.orig/virtinst/urlfetcher.py
+++ virt-manager-1.4.2/virtinst/urlfetcher.py
@@ -466,6 +466,10 @@ def _distroFromSUSEContent(fetcher, arch
- dclass = SLESDistro
+ dclass = OESDistro
if distro_version is None:
- distro_version = ['VERSION', distribution[1].strip().rsplit('
')[4]]
+ distro_version = _parse_sle_distribution(distribution)
+ elif re.match(".*SUSE Container as a Service Platform*",
distribution[1]):
+ dclass = CAASPDistro
+ if distro_version is None:
@@ -15,32 +15,22 @@
elif re.match(".*openSUSE.*", distribution[1]):
dclass = OpensuseDistro
if distro_version is None:
-@@ -1028,7 +1032,8 @@ class SuseDistro(Distro):
- distro_version = self.version_from_content[1].strip()
- version = distro_version.split('.', 1)[0].strip()
- self.os_variant = self.urldistro
-- if int(version) >= 10:
-+ version_int = int(version)
-+ if version_int >= 10:
- if self.os_variant.startswith(("sles", "sled")):
- sp_version = None
- if len(distro_version.split('.', 1)) == 2:
-@@ -1042,6 +1047,8 @@ class SuseDistro(Distro):
- self.os_variant += "tumbleweed"
- else:
- self.os_variant += distro_version
-+ elif version_int == 1 and self.os_variant.startswith("caasp"):
+@@ -1052,6 +1056,8 @@ class SuseDistro(Distro):
+ self.os_variant += major_version + 'sp' + sp_version
+ else:
+ self.os_variant += major_version
++ elif self.os_variant.startswith("caasp"):
+ self.os_variant = "caasp"
else:
self.os_variant += "9"
-@@ -1088,6 +1095,9 @@ class SLESDistro(SuseDistro):
- class SLEDDistro(SuseDistro):
- urldistro = "sled"
+@@ -1090,6 +1096,9 @@ class SuseDistro(Distro):
+ return osobj.name
+ return self.os_variant
+class CAASPDistro(SuseDistro):
+ urldistro = "caasp"
+
- # Suse image store is harder - we fetch the kernel RPM and a helper
- # RPM and then munge bits together to generate a initrd
+ class SLESDistro(SuseDistro):
+ urldistro = "sles"
++++++ virtinst-add-sle15-detection-support.patch ++++++
--- /var/tmp/diff_new_pack.5015Ut/_old 2017-09-15 22:31:21.671044077 +0200
+++ /var/tmp/diff_new_pack.5015Ut/_new 2017-09-15 22:31:21.671044077 +0200
@@ -22,7 +22,7 @@
+ pbuf = fetcher.acquireFileContent("media.1/products").rsplit('/',
1)[1].strip()
+ # Older style products format:
SUSE-Linux-Enterprise-Server-11-SP4 11.4.4-1.109
+ # Newer style products format: SLES12-SP3 12.3-0
-+ if pbuf.startswith('SLE'):
++ if pbuf.startswith('SLE') or pbuf.startswith('leanos'):
+ pbuf = pbuf.split(' ')[0]
+ pbuf = " ".join(re.split('(\d+)', pbuf, 1))
+ cbuf = "\nDISTRO ," + pbuf.replace('-', ' ')
@@ -33,16 +33,17 @@
distribution = None
distro_version = None
-@@ -465,7 +478,7 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -465,7 +478,8 @@ def _distroFromSUSEContent(fetcher, arch
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]) or re.match("SLES*",
distribution[1]):
++ re.match(".*SUSE SLES*", distribution[1]) or re.match("SLES*",
distribution[1]) or \
++ re.match("leanos*", distribution[1]):
dclass = SLESDistro
if distro_version is None:
distro_version = _parse_sle_distribution(distribution)
-@@ -481,7 +494,7 @@ def _distroFromSUSEContent(fetcher, arch
+@@ -481,7 +495,7 @@ def _distroFromSUSEContent(fetcher, arch
dclass = CAASPDistro
if distro_version is None:
distro_version = ['VERSION', distribution[1].strip().rsplit('
')[6]]
@@ -51,7 +52,7 @@
dclass = OpensuseDistro
if distro_version is None:
distro_version = ['VERSION',
distribution[0].strip().rsplit(':')[4]]
-@@ -1040,8 +1053,11 @@ class SuseDistro(Distro):
+@@ -1040,8 +1054,11 @@ class SuseDistro(Distro):
self._xen_kernel_paths = [("boot/%s/vmlinuz-xenpae" %
self.arch,
"boot/%s/initrd-xenpae" %
self.arch)]
else:
++++++ virtinst-detect-oes-distros.patch ++++++
--- /var/tmp/diff_new_pack.5015Ut/_old 2017-09-15 22:31:21.695040697 +0200
+++ /var/tmp/diff_new_pack.5015Ut/_new 2017-09-15 22:31:21.699040134 +0200
@@ -9,9 +9,63 @@
if distro_version is None:
distro_version = _parse_sle_distribution(distribution)
+ elif re.match(".*Open Enterprise Server*", distribution[1]):
-+ dclass = SLESDistro
++ dclass = OESDistro
+ if distro_version is None:
-+ distro_version = ['VERSION', distribution[1].strip().rsplit('
')[4]]
++ distro_version = _parse_sle_distribution(distribution)
elif re.match(".*openSUSE.*", distribution[1]):
dclass = OpensuseDistro
if distro_version is None:
+@@ -1018,20 +1022,30 @@ class SuseDistro(Distro):
+ distro_version = self.version_from_content[1].strip()
+ version = distro_version.split('.', 1)[0].strip()
+ self.os_variant = self.urldistro
+- if int(version) >= 10:
+- if self.os_variant.startswith(("sles", "sled")):
+- sp_version = None
+- if len(distro_version.split('.', 1)) == 2:
+- sp_version = 'sp' + distro_version.split('.',
1)[1].strip()
+- self.os_variant += version
+- if sp_version:
+- self.os_variant += sp_version
++
++ sp_version = None
++ if self.os_variant.startswith(("sles", "sled")):
++ if len(distro_version.split('.', 1)) == 2:
++ sp_version = 'sp' + distro_version.split('.', 1)[1].strip()
++ self.os_variant += version
++ if sp_version:
++ self.os_variant += sp_version
++ elif self.os_variant.startswith("opensuse"):
++ if len(version) == 8:
++ self.os_variant += "tumbleweed"
+ else:
+- # Tumbleweed 8 digit date
+- if len(version) == 8:
+- self.os_variant += "tumbleweed"
+- else:
+- self.os_variant += distro_version
++ self.os_variant += distro_version
++ elif self.os_variant.startswith("oes"):
++ versions = distro_version.split('.')
++ major_version = versions[0]
++ if len(versions) == 3:
++ sp_version = versions[2]
++ elif len(versions) == 2:
++ sp_version = versions[1]
++ if sp_version:
++ self.os_variant += major_version + 'sp' + sp_version
++ else:
++ self.os_variant += major_version
+ else:
+ self.os_variant += "9"
+
+@@ -1078,6 +1092,9 @@ class SLESDistro(SuseDistro):
+ class SLEDDistro(SuseDistro):
+ urldistro = "sled"
+
++class OESDistro(SuseDistro):
++ urldistro = "oes"
++
+
+ # Suse image store is harder - we fetch the kernel RPM and a helper
+ # RPM and then munge bits together to generate a initrd
++++++ virtinst-fix-sle-distro-parsing.patch ++++++
--- /var/tmp/diff_new_pack.5015Ut/_old 2017-09-15 22:31:21.711038444 +0200
+++ /var/tmp/diff_new_pack.5015Ut/_new 2017-09-15 22:31:21.711038444 +0200
@@ -28,15 +28,3 @@
return ['VERSION', sle_version]
dclass = GenericDistro
-@@ -1036,7 +1047,10 @@ class SuseDistro(Distro):
- distro_version = self.version_from_content[1].strip()
- version = distro_version.split('.', 1)[0].strip()
- self.os_variant = self.urldistro
-- version_int = int(version)
-+ if version.isdigit():
-+ version_int = int(version)
-+ else:
-+ version_int = 12
- if version_int >= 10:
- if self.os_variant.startswith(("sles", "sled")):
- sp_version = None
