Add libguestfs to list of OCaml packages.

[goaljobs-goals.git] / fedora_ocaml_rebuild.ml

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index fd8bd47..fed826d 100644 (file)
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -14,7 +14,7 @@ let koji_target = "rawhide"
 (* 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.0+rc1"
+let rebuild_name = "ocaml-4.02.1"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -23,10 +23,9 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "ocaml-pa-do";                        (* build failure, complex *)
-  "frama-c";                            (* build failure *)
-  "gappalib-coq";                       (* build failure in configure script *)
-  "ocaml-camlimages";                   (* build failure, conflicting C types in header files *)
+  "ocaml-pa-do";                        (* orphaned *)
+  "llvm";                               (* FTBFS, unrelated to OCaml *)
+  "plplot";                             (* FTBFS, unrelated to OCaml *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -35,9 +34,6 @@ let ignored = [
   "ocaml-srpm-macros";             (* don't need to build this *)
   "ocaml";                         (* rebuilt by hand *)
   "whenjobs";                      (* obsolete *)
-  "libguestfs";                    (* rebuilt by hand *)
-  "graphviz";                      (* rebuilt by hand *)
-  "plplot";                        (* already done *)
 ]
 let ignored pkg = List.mem pkg ignored
 
@@ -46,9 +42,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"; "llvm"; "plplot"; "virt-top"; "why3"; "xen";
+           "js-of-ocaml"; "llvm"; "plplot"; "virt-top"; "why3";
            "flocq" (* no OCaml code, but needs to be rebuilt after Coq *);
-           "guestfs-browser";
+           "guestfs-browser"; "libguestfs";
            "virt-dmesg" ]
 
 (* Dependencies of each package.  (pkg, [deps ...]) *)
@@ -269,16 +265,6 @@ and specfile_updated pkg =
 
   sh "
     cd %s
-    echo 'Please make further changes as required to the spec file %s.spec'
-    echo '(Press return key)'
-    read
-    emacs -nw %s
-    echo 'OK to commit this change? (press ^C if not)'
-    read
     fedpkg commit -c
-    echo 'OK to push this change? (press ^C if not)'
-    read
     fedpkg push
   " repodir
-    pkg
-    specfile