rpms/virt-v2v
6
0
Fork 0
Code Issues Pull Requests Releases Activity

New upstream version 1.43.4.

Browse Source
This commit is contained in:
Richard W.M. Jones 2021-03-03 12:59:29 +00:00
parent ff416b9134
commit 104a51bea0
3 changed files with 8 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-mlstdutils-std_utils.ml-Fix-for-OCaml-4.12.patch
View File

@ -1,35 +0,0 @@
From cc4ecbe236914f9b391ecf3815008547472632f8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 2 Mar 2021 10:39:15 +0000
Subject: [PATCH] mlstdutils/std_utils.ml: Fix for OCaml 4.12.
We were using a default function from somewhere called "compare"
instead of the actual function (Pervasives.compare / Stdlib.compare).
Since the wrong default function was used it had a different type from
what we expected:
File "std_utils.ml", line 312, characters 36-37:
312 | | (y, y') :: _ when cmp x y = 0 -> y'
^
Error: This expression has type int but an expression was expected of type
'weak1 list -> int
---
common/mlstdutils/std_utils.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/mlstdutils/std_utils.ml b/common/mlstdutils/std_utils.ml
index 4237ea519..88477179a 100644
--- a/common/mlstdutils/std_utils.ml
+++ b/common/mlstdutils/std_utils.ml
@@ -307,7 +307,7 @@ module List = struct
| x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs
| _ -> invalid_arg "combine3"
- let rec assoc_lbl ?(cmp = compare) ~default x = function
+ let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function
| [] -> default
| (y, y') :: _ when cmp x y = 0 -> y'
| _ :: ys -> assoc_lbl ~cmp ~default x ys
--
2.29.0.rc2

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (virt-v2v-1.43.3.tar.gz) = 39f6b4ad8b18a32dd3b584fb007f9c5b34140dde87874280b4df2e97f997aedef14312db032bff3ce6215ad5c7a58974789a41a7537fa06deac86e3a7cd04a8b
SHA512 (virt-v2v-1.43.3.tar.gz.sig) = 34dd70ad265af89aa9d9e971fdc0927e20d0926dc269c6125a95c139b0cfd0aaf040da4baeac8d81af3ae43f8d90a5ff5a6f53f30daa4c1374af002964f77975
SHA512 (virt-v2v-1.43.4.tar.gz) = 3c11ea864b0a1dd579c8dff891295be9200c9ba9e1d804cfd50aa356d626b8aa11a08c70ac2c6e20e5e9e023fea0d46e8f84edc1fca59484521ca273857f5c57
SHA512 (virt-v2v-1.43.4.tar.gz.sig) = 292d02fc94888446016b34637e1ea913a753d0f430a130f881b7f101ed4887b13b91c551353c45f9f73d9876b1e3941e846e8ecde5ed3996c999578557bbc944

12
virt-v2v.spec
View File

@ -9,8 +9,8 @@
Name: virt-v2v
Epoch: 1
Version: 1.43.3
Release: 4%{?dist}
Version: 1.43.4
Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPLv2+
@ -26,9 +26,6 @@ Source2: libguestfs.keyring
# Maintainer script which helps with handling patches.
Source3: copy-patches.sh
# Fix for OCaml 4.12.
Patch1: 0001-mlstdutils-std_utils.ml-Fix-for-OCaml-4.12.patch
%if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no
# kernel built for this architecture any longer and libguestfs rather
@ -266,7 +263,10 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local
%changelog
* Tue Mar 2 12:43:06 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.3-4
* Tue Mar 3 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.4-1
- New upstream version 1.43.4.
* Tue Mar 2 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.3-4
- OCaml 4.12.0 build
* Tue Mar 2 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.3-3