OCaml 5.0.0 rebuild
This commit is contained in:
parent
20323cd1bc
commit
484ddbffba
17
virt-v2v-ocaml5.patch
Normal file
17
virt-v2v-ocaml5.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- virt-v2v-2.3.4/common/mlstdutils/std_utils.ml.orig 2023-02-20 12:00:29.154785477 -0700
|
||||
+++ virt-v2v-2.3.4/common/mlstdutils/std_utils.ml 2023-07-10 09:34:10.295869331 -0600
|
||||
@@ -341,12 +341,12 @@ module List = struct
|
||||
| x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs
|
||||
| _ -> invalid_arg "combine3"
|
||||
|
||||
- let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function
|
||||
+ let rec assoc_lbl ?(cmp = Stdlib.compare) ~default x = function
|
||||
| [] -> default
|
||||
| (y, y') :: _ when cmp x y = 0 -> y'
|
||||
| _ :: ys -> assoc_lbl ~cmp ~default x ys
|
||||
|
||||
- let uniq ?(cmp = Pervasives.compare) xs =
|
||||
+ let uniq ?(cmp = Stdlib.compare) xs =
|
||||
let rec loop acc = function
|
||||
| [] -> acc
|
||||
| [x] -> x :: acc
|
@ -1,4 +1,3 @@
|
||||
%undefine _package_note_flags
|
||||
# If we should verify tarball signature with GPGv2.
|
||||
%global verify_tarball_signature 1
|
||||
|
||||
@ -16,7 +15,7 @@
|
||||
Name: virt-v2v
|
||||
Epoch: 1
|
||||
Version: 2.3.4
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: Convert a virtual machine to run on KVM
|
||||
|
||||
License: GPL-2.0-or-later AND LGPL-2.0-or-later
|
||||
@ -32,6 +31,9 @@ Source2: libguestfs.keyring
|
||||
# Maintainer script which helps with handling patches.
|
||||
Source3: copy-patches.sh
|
||||
|
||||
# Adapt to OCaml 5.0.0
|
||||
Patch0: %{name}-ocaml5.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
|
||||
@ -319,6 +321,9 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 1:2.3.4-3
|
||||
- OCaml 5.0.0 rebuild
|
||||
|
||||
* Mon Jun 05 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.3.4-2
|
||||
- Migrated to SPDX license
|
||||
- Fix installation on newer RHEL
|
||||
|
Loading…
Reference in New Issue
Block a user