From 7afee836ed25f9a805c68548d54a8fa1da9be7e8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 13 May 2017 11:32:19 +0100 Subject: [PATCH] Rebuild for OCaml 4.04.1 --- fedora_ocaml_rebuild.ml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml index 13a8c01..54a2551 100644 --- a/fedora_ocaml_rebuild.ml +++ b/fedora_ocaml_rebuild.ml @@ -9,7 +9,7 @@ open Git open Fedora let branch = "master" -let side_tag = Some "f24-ocaml" +let side_tag = Some "f27-ocaml" let koji_target = match side_tag with @@ -19,7 +19,7 @@ let koji_target = (* 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.04.1" (* Local repository that contains build dependencies. *) let yum_repo = "koji-rawhide" @@ -28,8 +28,7 @@ let yum_repo = "koji-rawhide" * dependent packages. *) let blocked = [ - "ocaml-pa-do"; (* orphaned *) - "ocaml-camlp5"; (* not updated to 4.02.3 yet *) + "brltty"; (* broken for non-OCaml reasons *) ] let blocked pkg = List.mem pkg blocked @@ -37,7 +36,6 @@ 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 @@ -46,10 +44,9 @@ let source_packages = let dirs = shlines "cd %s && ls -1d ocaml*" 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"; + "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 -- 1.8.3.1