X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fedora_ocaml_rebuild.ml;h=e575f6fa0ce2ba33f04e027a75190c40f5d88d5b;hb=62ad7400deab4ca095345bb5fa746cbb29bd930b;hp=fd8bd47fa5b3845aa3ceb89efa79128c0ddb6273;hpb=4b474a524994c85339b5f50b5d8df734a8efae96;p=goaljobs-goals.git

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index fd8bd47..e575f6f 100644
--- 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.0 final"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -23,10 +23,8 @@ 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 *)
+  "ocaml-zarith";                       (* int types *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -35,9 +33,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
 
@@ -269,16 +264,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