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 54a2551..5a636ed 100644 (file)
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -9,17 +9,18 @@ open Git
 open Fedora
 
 let branch = "master"
-let side_tag = Some "f27-ocaml"
+(*let side_tag = Some "f32-ocaml"*)
+let side_tag = None
 
 let koji_target =
   match side_tag with
   | Some t -> t
-  | None -> "rawhide"
+  | 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.04.1"
+let rebuild_name = "OCaml 4.08.1 (final)"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -28,7 +29,7 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "brltty";                        (* broken for non-OCaml reasons *)
+  "ocaml-yojson";   (* jjames is looking at this *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -41,12 +42,17 @@ let ignored pkg = List.mem pkg ignored
 
 (* List of OCaml-related source package names. *)
 let source_packages =
-  let dirs = shlines "cd %s && ls -1d ocaml*" fedora_dir in
+  let dirs = shlines "
+       cd %s && \
+       for f in ocaml*; do
+         [ -f \"$f/master/$f.spec\" ] && echo \"$f\"
+       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