Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2019-04-18 09:57:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new.17052 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libguestfs" Thu Apr 18 09:57:24 2019 rev:65 rq:695339 version:1.38.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2019-04-09 20:19:09.909881624 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new.17052/libguestfs.changes 2019-04-18 09:57:28.545380914 +0200 @@ -1,0 +2,9 @@ +Wed Apr 17 17:37:04 UTC 2019 - Larry Dewey <[email protected]> + +- Fixing issue with virt-customize in SLES and openSUSE guests + (boo#1132790) + Patches added: + 28bd06227b-inspect-handle-os-release-opensuse-tumbleweed-as-ope.patch + 70407cd622-inspection-Parse-os-release-opensuse-leap-as-opensus.patch + +------------------------------------------------------------------- New: ---- 28bd06227b-inspect-handle-os-release-opensuse-tumbleweed-as-ope.patch 70407cd622-inspection-Parse-os-release-opensuse-leap-as-opensus.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.eIFnL1/_old 2019-04-18 09:57:29.873381742 +0200 +++ /var/tmp/diff_new_pack.eIFnL1/_new 2019-04-18 09:57:29.877381744 +0200 @@ -145,6 +145,8 @@ Patch0: d0e5a819-python-Fix-missing-additional-backslashes.patch Patch1: 0a55098f-builder-repository-fix-compute_short_id-for-sles-X.0.patch Patch2: fd43730e-error-with-uninstall-option-on-SUSE.patch +Patch3: 70407cd622-inspection-Parse-os-release-opensuse-leap-as-opensus.patch +Patch4: 28bd06227b-inspect-handle-os-release-opensuse-tumbleweed-as-ope.patch # Pending upstram review Patch50: 0001-Introduce-a-wrapper-around-xmlParseURI.patch Patch51: 0002-common-extract-UTF-8-conversion-function.patch @@ -560,6 +562,8 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %patch50 -p1 %patch51 -p1 %patch52 -p1 @@ -808,7 +812,7 @@ %files -n libguestfs0 %defattr(-,root,root) -%doc COPYING.LIB +%license COPYING.LIB %{_libdir}/*.so.* %files devel @@ -828,7 +832,7 @@ %files -n guestfs-tools -f %{name}.lang %defattr(-,root,root) -%doc COPYING +%license COPYING %{_sbindir}/libguestfs-make-fixed-appliance %{_bindir}/* %exclude %{_bindir}/virt-v2v ++++++ 28bd06227b-inspect-handle-os-release-opensuse-tumbleweed-as-ope.patch ++++++ >From 2e6b8af52042eadc0ca9f8cac3a8c384671e157b Mon Sep 17 00:00:00 2001 From: Pino Toscano <[email protected]> Date: Fri, 30 Nov 2018 12:41:03 +0100 Subject: [PATCH 2/2] inspect: handle os-release "opensuse-tumbleweed" as opensuse Followup of commit 70407cd622dda6f088a0876e1e1ae669e9f8a281 for openSUSE Thumbleweed. (cherry picked from commit 28bd06227b1633fa08c073fe8dbe65d013d7dc9e) Signed-off-by: Larry Dewey <[email protected]> --- daemon/inspect_fs_unix.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml index c0c0a75a4..b6a9af707 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -142,7 +142,8 @@ and distro_of_os_release_id = function | "frugalware" -> Some DISTRO_FRUGALWARE | "mageia" -> Some DISTRO_MAGEIA | "neokylin" -> Some DISTRO_NEOKYLIN - | "opensuse" | "opensuse-leap" -> Some DISTRO_OPENSUSE + | "opensuse" -> Some DISTRO_OPENSUSE + | s when String.is_prefix s "opensuse-" -> Some DISTRO_OPENSUSE | "pld" -> Some DISTRO_PLD_LINUX | "rhel" -> Some DISTRO_RHEL | "sles" | "sled" -> Some DISTRO_SLES -- 2.21.0 ++++++ 70407cd622-inspection-Parse-os-release-opensuse-leap-as-opensus.patch ++++++ >From d22e678ba961b0b23376db2b290340700e1c2c9c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <[email protected]> Date: Mon, 1 Oct 2018 09:51:15 +0100 Subject: [PATCH 1/2] inspection: Parse os-release "opensuse-leap" as opensuse (RHBZ#1634248). (cherry picked from commit 70407cd622dda6f088a0876e1e1ae669e9f8a281) Signed-off-by: Larry Dewey <[email protected]> --- daemon/inspect_fs_unix.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/inspect_fs_unix.ml b/daemon/inspect_fs_unix.ml index d0323af3f..c0c0a75a4 100644 --- a/daemon/inspect_fs_unix.ml +++ b/daemon/inspect_fs_unix.ml @@ -142,7 +142,7 @@ and distro_of_os_release_id = function | "frugalware" -> Some DISTRO_FRUGALWARE | "mageia" -> Some DISTRO_MAGEIA | "neokylin" -> Some DISTRO_NEOKYLIN - | "opensuse" -> Some DISTRO_OPENSUSE + | "opensuse" | "opensuse-leap" -> Some DISTRO_OPENSUSE | "pld" -> Some DISTRO_PLD_LINUX | "rhel" -> Some DISTRO_RHEL | "sles" | "sled" -> Some DISTRO_SLES -- 2.21.0
