diff --git a/virt-v2v-ocaml5.patch b/virt-v2v-ocaml5.patch deleted file mode 100644 index 1ed5a80..0000000 --- a/virt-v2v-ocaml5.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 diff --git a/virt-v2v.spec b/virt-v2v.spec index 9d034ee..963e6b5 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -6,7 +6,7 @@ %global patches_touch_autotools %{nil} %else # On RHEL the downstream patches always touch autotools files. -%global patches_touch_autotools 1 +%global patches_touch_autotools %{nil} %endif # The source directory. @@ -31,9 +31,6 @@ 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