Remove bundled ocaml-augeas

resolves: RHEL-32142

0010-update-common-submodule.patch

@@ -1,4 +1,4 @@
-From 194a48aef32367c45c555a4d93fb1a3375b0dead Mon Sep 17 00:00:00 2001
+From 9094eba0abb614e962157ff3399fe6f203676bc7 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 19 May 2023 16:08:47 +0200
 Subject: [PATCH] update common submodule

0011-LUKS-on-LVM-inspection-test-rename-VGs-and-LVs.patch

@@ -1,4 +1,4 @@
-From c95b3086bdbdf840de8d3b24c3ae5e9b847bf588 Mon Sep 17 00:00:00 2001
+From 1cbe833c756d4e8bf4507319f086e7acbc5c15cb Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 19 May 2023 16:08:48 +0200
 Subject: [PATCH] LUKS-on-LVM inspection test: rename VGs and LVs

0012-LUKS-on-LVM-inspection-test-test-dev-mapper-VG-LV-tr.patch

@@ -1,4 +1,4 @@
-From 15cc20d1f5e0413c1af26c683437995886146eb6 Mon Sep 17 00:00:00 2001
+From 03151a1e315e8e7a52a330254bd1486776fb5add Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 19 May 2023 16:08:49 +0200
 Subject: [PATCH] LUKS-on-LVM inspection test: test /dev/mapper/VG-LV

0013-Replace-Pervasives.-with-Stdlib.patch

@@ -1,4 +1,4 @@
-From 54a9e48e5e1088a1b781c30b49bce695007e12fc Mon Sep 17 00:00:00 2001
+From 6db883aa6b9982964de19ab73f9f3baa1ec370f8 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 22 May 2023 16:40:21 +0100
 Subject: [PATCH] Replace Pervasives.* with Stdlib.*
@@ -65,7 +65,7 @@ index 62f387ee..087b5031 100644
      with
        exn ->
 diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod
-index b9bc885a..33703a96 100644
+index 5a7fa40f..2c084521 100644
 --- a/docs/guestfs-building.pod
 +++ b/docs/guestfs-building.pod
 @@ -119,7 +119,7 @@ virt tools which are still written in Perl.
@@ -100,7 +100,7 @@ index d7e6eba3..ed6e9372 100644
    (* Is the new file different from the current file? *)
    if Sys.file_exists filename && files_equal filename filename_new then
 diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
-index 51072c1a..e850fb8c 100644
+index 85020717..39a8346f 100644
 --- a/m4/guestfs-ocaml.m4
 +++ b/m4/guestfs-ocaml.m4
 @@ -38,10 +38,10 @@ AC_ARG_ENABLE([ocaml],

0014-fuse-Don-t-call-fclose-NULL-on-error-paths.patch

@@ -1,4 +1,4 @@
-From 1cdc22fa656a44320e9c53401130e98f536c9759 Mon Sep 17 00:00:00 2001
+From 51d6b17cdd054b96fc83c09541620ffb2f20919e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 22 May 2023 17:15:39 +0100
 Subject: [PATCH] fuse: Don't call fclose(NULL) on error paths

0015-ocaml-implicit_close-test-collect-all-currently-unre.patch

@@ -1,4 +1,4 @@
-From feb17e93b4e58131cf6875c4ae638a791a875a22 Mon Sep 17 00:00:00 2001
+From dc076916ebaa4b70441d54a09d725dd3c349e740 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=BCrgen=20H=C3=B6tzel?= <juergen@archlinux.org>
 Date: Sat, 27 May 2023 15:32:36 +0200
 Subject: [PATCH] ocaml/implicit_close test: collect all currently unreachable

0016-ocaml-Replace-old-enter-leave_blocking_section-calls.patch

@@ -1,4 +1,4 @@
-From dd58abc40175f735f6fe2669c34c67e6190e557d Mon Sep 17 00:00:00 2001
+From 4a43ae5779424e8b175cfc8d0671378d68afbe9c Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 27 Jun 2023 10:17:58 +0100
 Subject: [PATCH] ocaml: Replace old enter/leave_blocking_section calls

0017-ocaml-Release-runtime-lock-around-guestfs_close.patch

@@ -1,4 +1,4 @@
-From e2110f72069f184c87df348247e8f3106c81d44a Mon Sep 17 00:00:00 2001
+From 73045a40a9bc3b556eb3893872b4c39ec3161f99 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 27 Jun 2023 11:36:55 +0100
 Subject: [PATCH] ocaml: Release runtime lock around guestfs_close

0018-ocaml-Conditionally-acquire-the-lock-in-callbacks.patch

@@ -1,4 +1,4 @@
-From e42cd859265c34d2013a45b742d4c36bb7617445 Mon Sep 17 00:00:00 2001
+From 18b4d4bf5fed0af96a0924cc3e65d5434d4b4aaa Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 27 Jun 2023 12:09:12 +0100
 Subject: [PATCH] ocaml: Conditionally acquire the lock in callbacks

0019-ocaml-Fix-guestfs_065_implicit_close.ml-for-OCaml-5.patch

@@ -1,4 +1,4 @@
-From 7ceafac98d3eb28d25195622cb6dc1158e9c1c2f Mon Sep 17 00:00:00 2001
+From 69c86200b3e8ea730be1d6ef81c0f0a07097f611 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 27 Jun 2023 16:20:49 +0100
 Subject: [PATCH] ocaml: Fix guestfs_065_implicit_close.ml for OCaml 5

0020-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch

@@ -1,4 +1,4 @@
-From d4fabae17001702894526084bf0ab516de3599d5 Mon Sep 17 00:00:00 2001
+From db11cccf232bce357a3b9699fb5d1111723cdc25 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 27 Jun 2023 16:31:55 +0100
 Subject: [PATCH] ocaml: Use Caml_state_opt in preference to caml_state

0021-generator-Add-chown-option-for-virt-customize.patch

@@ -1,4 +1,4 @@
-From 64c1716c4120e8dc69d0106b6ebcf6ccb9d4fc24 Mon Sep 17 00:00:00 2001
+From b96428396bafb05adaaeae5e4da99ca257d56230 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 29 Jun 2023 13:33:04 +0100
 Subject: [PATCH] generator: Add --chown option for virt-customize

0022-lib-remove-guestfs_int_cmd_clear_close_files.patch

@@ -1,4 +1,4 @@
-From 6c63f5cd8b43448f4847d550ad313d950d6b8520 Mon Sep 17 00:00:00 2001
+From 23e34435b2bc4cbb40ad383658e03a7ba78b50f2 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Tue, 11 Jul 2023 13:39:06 +0200
 Subject: [PATCH] lib: remove guestfs_int_cmd_clear_close_files()

0023-docs-fix-broken-link-in-the-guestfs-manual.patch

@@ -1,4 +1,4 @@
-From f8e8aef7e9e8334db19529aa46bd28a209436b50 Mon Sep 17 00:00:00 2001
+From cdc81e3491c93ab23884e072ef63803af1fb23da Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 14 Jul 2023 15:22:09 +0200
 Subject: [PATCH] docs: fix broken link in the guestfs manual

0024-docs-clarify-sockdir-s-separation.patch

@@ -1,4 +1,4 @@
-From cde50cb9d71ffa418f45868aa0d4b874847b989a Mon Sep 17 00:00:00 2001
+From 8545c612beba2e3bc8b89664ef74c9ee9e22b8e6 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 14 Jul 2023 15:22:10 +0200
 Subject: [PATCH] docs: clarify sockdir's separation

0025-lib-move-guestfs_int_create_socketname-from-launch.c.patch

@@ -1,4 +1,4 @@
-From 986f5d8b1110b461d37d044c7a8052ed7ba27f87 Mon Sep 17 00:00:00 2001
+From bd8c3bd5262b3446f699731ef00dfa62b6fdd8df Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 14 Jul 2023 15:22:11 +0200
 Subject: [PATCH] lib: move guestfs_int_create_socketname() from "launch.c" to

0026-generator-customize-Add-new-StringTriplet-for-use-by.patch

@@ -1,4 +1,4 @@
-From 6e3d91681c7dffdfdf291a809d6773691a2a7bda Mon Sep 17 00:00:00 2001
+From ee2ed1cd009f02e44d137fc78e11bd553f62dcc5 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sat, 15 Jul 2023 16:33:18 +0100
 Subject: [PATCH] generator: customize: Add new StringTriplet for use by

0027-daemon-lvm-Do-reverse-device-name-translation-on-pvs.patch

@@ -1,4 +1,4 @@
-From ec56c62c90d2230e8edcfaaad4517be63f5e2183 Mon Sep 17 00:00:00 2001
+From 7052506cbfdb071c0d89c7ef6a14c1b17de9b208 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 20 Jul 2023 11:15:26 +0100
 Subject: [PATCH] daemon: lvm: Do reverse device name translation on pvs_full

0028-ruby-Replace-MiniTest-with-Minitest.patch

@@ -1,4 +1,4 @@
-From a55474caa5029c8356957afe36908ee45484ffde Mon Sep 17 00:00:00 2001
+From e22e511b1f2e5010ef889171ea7ba57519f39a39 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 21 Sep 2023 15:16:51 +0100
 Subject: [PATCH] ruby: Replace MiniTest with Minitest

0029-ruby-Get-rid-of-old-Test-Unit-compatibility.patch

@@ -1,4 +1,4 @@
-From e22e17704988b606e24e76160495626552d0845f Mon Sep 17 00:00:00 2001
+From 6272924b7cf2320d5d89c6b5a0e1bd169a0caac2 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 21 Sep 2023 15:20:55 +0100
 Subject: [PATCH] ruby: Get rid of old Test::Unit compatibility

0030-generator-Sort-virt-customize-options-into-alphabeti.patch

@@ -1,4 +1,4 @@
-From 205e2219b977e70c97ea4b55153d94dc3df91c28 Mon Sep 17 00:00:00 2001
+From 57f2fa619d238778f1cd8e38b014b1b6a4e32058 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 26 Oct 2023 21:06:21 +0100
 Subject: [PATCH] generator: Sort virt-customize options into alphabetical

0031-generator-Add-new-virt-customize-tar-in-operation.patch

@@ -1,4 +1,4 @@
-From 055c43fa60c7cefbe3baf32b21cfe8ffae09bf0f Mon Sep 17 00:00:00 2001
+From 4be6e5f426270550ab24c612502dfe74217db51b Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 26 Oct 2023 19:44:03 +0100
 Subject: [PATCH] generator: Add new virt-customize --tar-in operation

0032-New-mailing-list-email-address.patch

@@ -1,4 +1,4 @@
-From 0c1d7af8fdbf272f33ccd572ed34923ab094d695 Mon Sep 17 00:00:00 2001
+From 0834340ed9995ce29f037a8a93fa17ea4721f5a7 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 16 Nov 2023 10:38:59 +0000
 Subject: [PATCH] New mailing list email address

0033-New-mailing-list-archives.patch

@@ -1,4 +1,4 @@
-From d5a52e1004b7b151a1df286a72e49e9766ade2c8 Mon Sep 17 00:00:00 2001
+From 0836003f9f7f9ccbd803388d1b716d0cdb70ae6d Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 16 Nov 2023 10:52:11 +0000
 Subject: [PATCH] New mailing list archives
@@ -43,10 +43,10 @@ index 40a7267e..b350edb5 100644
  To find out how to build libguestfs from source, read:
  
 diff --git a/configure.ac b/configure.ac
-index d1397f63..f8e5e9bb 100644
+index 0db21297..74f6d20b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -322,7 +322,7 @@ echo "If any optional component is configured 'no' when you expected 'yes'"
+@@ -321,7 +321,7 @@ echo "If any optional component is configured 'no' when you expected 'yes'"
  echo "then you should check the preceding messages."
  echo
  echo "Please report bugs back to the mailing list:"
@@ -87,10 +87,10 @@ index 1e83a9c5..3a03282f 100644
  into the libguestfs project.
  
 diff --git a/docs/guestfs-hacking.pod b/docs/guestfs-hacking.pod
-index 68cf8292..f0bac9f2 100644
+index e1b47ec1..987697b2 100644
 --- a/docs/guestfs-hacking.pod
 +++ b/docs/guestfs-hacking.pod
-@@ -818,7 +818,7 @@ examining the F<tmp/valgrind*> log files carefully.
+@@ -804,7 +804,7 @@ examining the F<tmp/valgrind*> log files carefully.
  =head2 SUBMITTING PATCHES
  
  Submit patches to the mailing list:

0034-lib-Include-libxml-parser.h-for-xmlReadMemory.patch

@@ -1,4 +1,4 @@
-From 64a928f631bc79d885d9822a3022c382cbd5fd55 Mon Sep 17 00:00:00 2001
+From 769a5fe0d135ec7181416475e89571b6d0a55d0e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 27 Nov 2023 14:04:33 +0000
 Subject: [PATCH] lib: Include <libxml/parser.h> for xmlReadMemory

0035-ocaml-Use-Gc.finalise-instead-of-a-C-finalizer.patch

@@ -1,4 +1,4 @@
-From 27aca404cfbfdf9b3d155fa0794f86936525f40c Mon Sep 17 00:00:00 2001
+From 2fc136404619b2d2161326d1ca1ce3715728f04f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 13 Dec 2023 22:50:56 +0000
 Subject: [PATCH] ocaml: Use Gc.finalise instead of a C finalizer

0036-ocaml-Nullify-custom-block-before-releasing-runtime-.patch

@@ -1,4 +1,4 @@
-From 9f52ab7794bf54169139995c5296aa5f39e47706 Mon Sep 17 00:00:00 2001
+From e9ef90e37334453a8ce7cf28665fd7b2ea354b82 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 14 Dec 2023 08:33:10 +0000
 Subject: [PATCH] ocaml: Nullify custom block before releasing runtime lock

0037-Update-common-submodule.patch

@@ -1,4 +1,4 @@
-From d015c300eb0d6ac1d366cf02b15b7aade7e3063a Mon Sep 17 00:00:00 2001
+From 52fb4507fee2a2e261515576d9b130c892e539d7 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 14 Dec 2023 09:03:49 +0000
 Subject: [PATCH] Update common submodule

0038-tests-Test-guestfish-key-all-.-selector.patch

@@ -1,4 +1,4 @@
-From 335642539772cfee442989f56f1b5d7803e4111c Mon Sep 17 00:00:00 2001
+From 84da41bab6f93b2091f23602e276cc7fb62778e3 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 14 Dec 2023 09:15:08 +0000
 Subject: [PATCH] tests: Test guestfish --key all:... selector

0039-generator-customize.ml-Split-chown-parameter-on-char.patch

@@ -1,4 +1,4 @@
-From 62e0172825304e3abe8e917d12bc5e5cb45b76cd Mon Sep 17 00:00:00 2001
+From ad473ca6b681170da08c170c869fa6f61d5934e4 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 19 Jan 2024 13:18:00 +0000
 Subject: [PATCH] generator/customize.ml: Split --chown parameter on ':'

0040-daemon-parted-Print-field-we-are-extracting-in-error.patch

@@ -1,4 +1,4 @@
-From fad637f859e89a8110c353fe26029de818d369f1 Mon Sep 17 00:00:00 2001
+From fc34a457be847e8a36704c23b5119f2cfaa4d4ee Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 7 Mar 2024 14:17:45 +0000
 Subject: [PATCH] daemon: parted: Print field we are extracting in error

0041-python-Fix-exception-name-in-example.patch

@@ -1,4 +1,4 @@
-From 25adec46d2b2042aa8c58b8c6103a9aa195d046a Mon Sep 17 00:00:00 2001
+From 1438bf8a356303f8545f2beb89aa97b71f0b1ded Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 12 Mar 2024 14:08:03 +0000
 Subject: [PATCH] python: Fix exception name in example

0042-po-docs-Rename-guestfs-release-notes-historical-to-g.patch

@@ -1,4 +1,4 @@
-From 21d7687521e611a243f9f217b8de799452dff260 Mon Sep 17 00:00:00 2001
+From c33f35c9d82d7e35de85544ec11696c47764c83c Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 4 Apr 2024 09:28:43 +0100
 Subject: [PATCH] po-docs: Rename guestfs-release-notes-historical to

0043-po-docs-Run-po4a-translate-and-sed-commands-separate.patch

@@ -1,4 +1,4 @@
-From e1ee1fb65798777287ae7722b9391969623da97f Mon Sep 17 00:00:00 2001
+From db04f9adc4e03ac32a303e9414acbdc215c521f2 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 4 Apr 2024 09:38:28 +0100
 Subject: [PATCH] po-docs: Run po4a-translate and sed commands separately

0044-Update-common-submodule.patch

@@ -1,4 +1,4 @@
-From 55810672dedbabf40938519eb37d7a470c28ea6a Mon Sep 17 00:00:00 2001
+From d3f1b35aadb15500985b401b15571f5406f2aedf Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 24 Apr 2024 12:23:34 +0100
 Subject: [PATCH] Update common submodule

0045-po-docs-Make-sure-guestmount.1-depends-on-includes.patch

@@ -1,4 +1,4 @@
-From 5efc6ee4723c828655c4ea2b56f40c0156536762 Mon Sep 17 00:00:00 2001
+From 406be1f7489326083f6d8bb532a0c65c667da825 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 24 Apr 2024 22:15:16 +0100
 Subject: [PATCH] po-docs: Make sure guestmount.1 depends on includes

libguestfs.spec

@@ -45,7 +45,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.50.1
-Release:       9%{?dist}
+Release:       10%{?dist}
 License:       LGPLv2+
 
 # Build only for architectures that have a kernel
@@ -100,43 +100,42 @@ Patch0006:     0006-RHEL-Disable-unsupported-remote-drive-protocols-RHBZ.patch
 Patch0007:     0007-RHEL-Reject-use-of-libguestfs-winsupport-features-ex.patch
 Patch0008:     0008-Remove-virt-dib.patch
 Patch0009:     0009-lib-Choose-q35-machine-type-for-x86-64.patch
-Patch0010:     0010-RHEL-Revert-build-Remove-bundled-copy-of-ocaml-augea.patch
+Patch0010:     0010-update-common-submodule.patch
-Patch0011:     0011-update-common-submodule.patch
+Patch0011:     0011-LUKS-on-LVM-inspection-test-rename-VGs-and-LVs.patch
-Patch0012:     0012-LUKS-on-LVM-inspection-test-rename-VGs-and-LVs.patch
+Patch0012:     0012-LUKS-on-LVM-inspection-test-test-dev-mapper-VG-LV-tr.patch
-Patch0013:     0013-LUKS-on-LVM-inspection-test-test-dev-mapper-VG-LV-tr.patch
+Patch0013:     0013-Replace-Pervasives.-with-Stdlib.patch
-Patch0014:     0014-Replace-Pervasives.-with-Stdlib.patch
+Patch0014:     0014-fuse-Don-t-call-fclose-NULL-on-error-paths.patch
-Patch0015:     0015-fuse-Don-t-call-fclose-NULL-on-error-paths.patch
+Patch0015:     0015-ocaml-implicit_close-test-collect-all-currently-unre.patch
-Patch0016:     0016-ocaml-implicit_close-test-collect-all-currently-unre.patch
+Patch0016:     0016-ocaml-Replace-old-enter-leave_blocking_section-calls.patch
-Patch0017:     0017-ocaml-Replace-old-enter-leave_blocking_section-calls.patch
+Patch0017:     0017-ocaml-Release-runtime-lock-around-guestfs_close.patch
-Patch0018:     0018-ocaml-Release-runtime-lock-around-guestfs_close.patch
+Patch0018:     0018-ocaml-Conditionally-acquire-the-lock-in-callbacks.patch
-Patch0019:     0019-ocaml-Conditionally-acquire-the-lock-in-callbacks.patch
+Patch0019:     0019-ocaml-Fix-guestfs_065_implicit_close.ml-for-OCaml-5.patch
-Patch0020:     0020-ocaml-Fix-guestfs_065_implicit_close.ml-for-OCaml-5.patch
+Patch0020:     0020-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch
-Patch0021:     0021-ocaml-Use-Caml_state_opt-in-preference-to-caml_state.patch
+Patch0021:     0021-generator-Add-chown-option-for-virt-customize.patch
-Patch0022:     0022-generator-Add-chown-option-for-virt-customize.patch
+Patch0022:     0022-lib-remove-guestfs_int_cmd_clear_close_files.patch
-Patch0023:     0023-lib-remove-guestfs_int_cmd_clear_close_files.patch
+Patch0023:     0023-docs-fix-broken-link-in-the-guestfs-manual.patch
-Patch0024:     0024-docs-fix-broken-link-in-the-guestfs-manual.patch
+Patch0024:     0024-docs-clarify-sockdir-s-separation.patch
-Patch0025:     0025-docs-clarify-sockdir-s-separation.patch
+Patch0025:     0025-lib-move-guestfs_int_create_socketname-from-launch.c.patch
-Patch0026:     0026-lib-move-guestfs_int_create_socketname-from-launch.c.patch
+Patch0026:     0026-generator-customize-Add-new-StringTriplet-for-use-by.patch
-Patch0027:     0027-generator-customize-Add-new-StringTriplet-for-use-by.patch
+Patch0027:     0027-daemon-lvm-Do-reverse-device-name-translation-on-pvs.patch
-Patch0028:     0028-daemon-lvm-Do-reverse-device-name-translation-on-pvs.patch
+Patch0028:     0028-ruby-Replace-MiniTest-with-Minitest.patch
-Patch0029:     0029-ruby-Replace-MiniTest-with-Minitest.patch
+Patch0029:     0029-ruby-Get-rid-of-old-Test-Unit-compatibility.patch
-Patch0030:     0030-ruby-Get-rid-of-old-Test-Unit-compatibility.patch
+Patch0030:     0030-generator-Sort-virt-customize-options-into-alphabeti.patch
-Patch0031:     0031-generator-Sort-virt-customize-options-into-alphabeti.patch
+Patch0031:     0031-generator-Add-new-virt-customize-tar-in-operation.patch
-Patch0032:     0032-generator-Add-new-virt-customize-tar-in-operation.patch
+Patch0032:     0032-New-mailing-list-email-address.patch
-Patch0033:     0033-New-mailing-list-email-address.patch
+Patch0033:     0033-New-mailing-list-archives.patch
-Patch0034:     0034-New-mailing-list-archives.patch
+Patch0034:     0034-lib-Include-libxml-parser.h-for-xmlReadMemory.patch
-Patch0035:     0035-lib-Include-libxml-parser.h-for-xmlReadMemory.patch
+Patch0035:     0035-ocaml-Use-Gc.finalise-instead-of-a-C-finalizer.patch
-Patch0036:     0036-ocaml-Use-Gc.finalise-instead-of-a-C-finalizer.patch
+Patch0036:     0036-ocaml-Nullify-custom-block-before-releasing-runtime-.patch
-Patch0037:     0037-ocaml-Nullify-custom-block-before-releasing-runtime-.patch
+Patch0037:     0037-Update-common-submodule.patch
-Patch0038:     0038-Update-common-submodule.patch
+Patch0038:     0038-tests-Test-guestfish-key-all-.-selector.patch
-Patch0039:     0039-tests-Test-guestfish-key-all-.-selector.patch
+Patch0039:     0039-generator-customize.ml-Split-chown-parameter-on-char.patch
-Patch0040:     0040-generator-customize.ml-Split-chown-parameter-on-char.patch
+Patch0040:     0040-daemon-parted-Print-field-we-are-extracting-in-error.patch
-Patch0041:     0041-daemon-parted-Print-field-we-are-extracting-in-error.patch
+Patch0041:     0041-python-Fix-exception-name-in-example.patch
-Patch0042:     0042-python-Fix-exception-name-in-example.patch
+Patch0042:     0042-po-docs-Rename-guestfs-release-notes-historical-to-g.patch
-Patch0043:     0043-po-docs-Rename-guestfs-release-notes-historical-to-g.patch
+Patch0043:     0043-po-docs-Run-po4a-translate-and-sed-commands-separate.patch
-Patch0044:     0044-po-docs-Run-po4a-translate-and-sed-commands-separate.patch
+Patch0044:     0044-Update-common-submodule.patch
-Patch0045:     0045-Update-common-submodule.patch
+Patch0045:     0045-po-docs-Make-sure-guestmount.1-depends-on-includes.patch
-Patch0046:     0046-po-docs-Make-sure-guestmount.1-depends-on-includes.patch
 
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool, gettext-devel
@@ -155,8 +154,7 @@ BuildRequires: perl(Pod::Man)
 BuildRequires: /usr/bin/pod2text
 BuildRequires: po4a
 BuildRequires: augeas-devel >= 1.7.0
-# Waiting for https://bugzilla.redhat.com/show_bug.cgi?id=2168634
+BuildRequires: ocaml-augeas-devel >= 0.6
-#BuildRequires: ocaml-augeas-devel >= 0.6
 BuildRequires: readline-devel
 BuildRequires: xorriso
 BuildRequires: libxml2-devel
@@ -1150,6 +1148,10 @@ rm ocaml/html/.gitignore
 
 
 %changelog
+* Thu Jun 20 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.50.1-10
+- Remove bundled ocaml-augeas
+  resolves: RHEL-32142
+
 * Wed Apr 24 2024 Richard W.M. Jones <rjones@redhat.com> - 1:1.50.1-9
 - Add support for nbd+unix:// URIs
   resolves: RHEL-33851