X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fedora_ocaml_rebuild.ml;h=a5645f193f48ceab8d078c4db73f1c15405f7fb8;hb=e98496449fbe9994aaee716a05e8208555e95f5d;hp=13a8c016b34a3d92cbb118d44b87c9b32d6d09af;hpb=5af4344c2ba347a22ab1229aa9d0f1e46585a8be;p=goaljobs-goals.git

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 13a8c01..a5645f1 100644
--- 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 "f24-ocaml"
+let side_tag = Some "f31-ocaml"
+(*let side_tag = None*)
 
 let koji_target =
   match side_tag with
   | Some t -> t
-  | None -> "rawhide"
+  | None -> "f31-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.02.3"
+let rebuild_name = "OCaml 4.08.0 (beta 3)"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -28,8 +29,9 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "ocaml-pa-do";                        (* orphaned *)
-  "ocaml-camlp5";                       (* not updated to 4.02.3 yet *)
+  "ocaml-camlp4";   (* not ported to 4.08 yet *)
+  "ocaml-camlp5";   (* not ported to 4.08 yet *)
+  "ocaml-zarith";   (* build failures, seemingly unrelated *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -37,19 +39,22 @@ let blocked pkg = List.mem pkg blocked
 let ignored = [
   "ocaml-srpm-macros";             (* don't need to build this *)
   "ocaml";                         (* rebuilt by hand *)
-  "whenjobs";                      (* obsolete *)
 ]
 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";
-           "js-of-ocaml"; "plplot"; "virt-top"; "why3"; "z3";
+           "opam"; "plplot"; "virt-top"; "why3"; "z3";
            "flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
-           "guestfs-browser"; "libguestfs";
-           "virt-dmesg" ]
+           "guestfs-browser"; "libguestfs" ]
 
 (* Dependencies of each package.  (pkg, [deps ...]) *)
 let pkg_deps = dependencies branch source_packages