From 308032e57053bc727f0abfdaa21121f0b8cf65a2 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 4 May 2020 17:10:03 +0100
Subject: [PATCH] New build of OCaml 4.11.0+dev2-2020-04-22.

- Reenable camlp5, lablgtk3, Coq, haxe, why3
- Reenable libguestfs, virt-v2v
---
 Goalfile | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/Goalfile b/Goalfile
index 8f5bb74..2b562ad 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,11 +6,11 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "master"
 #let fedora-branch = "f32"
-let fedora-tag = "f33-build-side-21752"
+let fedora-tag = "f33-build-side-22796"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "OCaml 4.11.0 pre-release attempt 2"
+let fedora-rebuild-name = "OCaml 4.11.0+dev2-2020-04-22 rebuild"
 
 # Packages that are blocked.  Any dependent packages are also blocked
 # automatically.
@@ -21,28 +21,24 @@ let fedora-rebuild-name = "OCaml 4.11.0 pre-release attempt 2"
 # they have been rebuilt.
 let fedora-ignored = [
     "ocaml-srpm-macros", "ocaml",
-
-    # Not updated yet for OCaml 4.11.
-    "ocaml-camlp5",
-    # Depends on camlp5:
-    "ocaml-lablgtk3",
 ]
 
 # All OCaml-related source package names
 let other-packages = [
     "alt-ergo", "apron", "brltty", "coccinelle",
-    "graphviz", "hevea", "hivex",
+    "graphviz", "haxe", "hevea", "hivex",
     "laby",
+    "libguestfs",
     "libnbd", "opam",
     "utop",
-    "virt-top",
+    "virt-top", "virt-v2v",
+    "why3",
     "z3",
 
     # For Coq:
-    # Depends on lablgtk3:
-    #"coq", "frama-c", "gappalib-coq",
-    #"zenon",
-    #"flocq",
+    "coq", "frama-c", "gappalib-coq",
+    "zenon",
+    "flocq",
 
     # Causes a cyclic dependency between libnbd <-> nbdkit.  We need
     # to fix this in goals itself, but in the meantime disable nbdkit
@@ -51,13 +47,6 @@ let other-packages = [
 
     # https://bugzilla.redhat.com/show_bug.cgi?id=1797853
     # "plplot",
-
-    # These packages require camlp5 which has not been updated for 4.11.
-    #"haxe",
-    #"why3",
-
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1826925
-    #"libguestfs", "virt-v2v",
 ]
 
 pure function get-source-packages () returning strings = {
-- 
1.8.3.1