Remove coq, camlp4 (+ downstream dependencies) from block list.

[goaljobs-goals.git] / fedora_ocaml_rebuild.ml

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 1103ebb..5a636ed 100644 (file)
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -9,18 +9,18 @@ open Git
 open Fedora
 
 let branch = "master"
-let side_tag = Some "f31-ocaml"
-(*let side_tag = None*)
+(*let side_tag = Some "f32-ocaml"*)
+let side_tag = None
 
 let koji_target =
   match side_tag with
   | Some t -> t
-  | None -> "f31-build"
+  | None -> "f32-build"
 
 (* The name of the rebuild, and also the magic substring that must
  * appear in the %changelog when the package has been rebuilt.
  *)
-let rebuild_name = "OCaml 4.08.0 (beta 3)"
+let rebuild_name = "OCaml 4.08.1 (final)"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -29,9 +29,7 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "ocaml-camlp4";   (* not ported to 4.08 yet *)
-  "ocaml-camlp5";   (* not ported to 4.08 yet *)
-  "ocaml-zarith";   (* build failures, seemingly unrelated *)
+  "ocaml-yojson";   (* jjames is looking at this *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -51,10 +49,10 @@ let source_packages =
        done
   " fedora_dir in
   dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
-           "cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
-           "plplot"; "virt-top"; "why3"; "z3";
+           "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
+           "opam"; "plplot"; "virt-top"; "why3"; "z3";
            "flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
-           "guestfs-browser"; "libguestfs" ]
+           "libguestfs" ]
 
 (* Dependencies of each package.  (pkg, [deps ...]) *)
 let pkg_deps = dependencies branch source_packages