X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fedora_ocaml_rebuild.ml;h=c708223078ddba42b6bd854e3d297f1b0f2ebe8b;hb=9b311682ee639fc3399056b7b93ba9bd0140a639;hp=39e95e7538c496d35274275210d714435c77f14e;hpb=511e6af609563e202b14006b2bf0b1cbb51f7a55;p=goaljobs-goals.git

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 39e95e7..c708223 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-0.8.git10e45753.fc22"
+let rebuild_name = "ocaml-4.02.0+rc1"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -26,6 +26,7 @@ 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 *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -34,9 +35,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
 
@@ -182,8 +180,12 @@ and rebuild_started pkg =
 
   (* Ignored packages are treated as if they have been rebuilt. *)
   if not (ignored pkg) then (
+(*
     (* A local test build must succeed. *)
     require (local_build_succeeded pkg);
+*)
+    (* local_build_succeeded normally does this ... *)
+    require (specfile_updated pkg);
 
     (* Rebuild the package in Koji.  Don't wait ... *)
     koji_build ~wait:false pkg branch;
@@ -209,6 +211,7 @@ and rebuild_started pkg =
     loop ()
   )
 
+(*
 and local_build_succeeded pkg =
   (* The specfile must have been updated. *)
   require (specfile_updated pkg);
@@ -227,6 +230,7 @@ and local_build_succeeded pkg =
   " (fedora_repo pkg branch);
 
   memory_set key "1"
+*)
 
 and specfile_updated pkg =
   let repodir = fedora_repo pkg branch in
@@ -244,7 +248,9 @@ and specfile_updated pkg =
       git pull --rebase
     " repodir;
 
+(* - XXX why did we do this here?
   install_build_dependencies pkg;
+*)
 
   (* For rationale behind always bumping the spec file, see comment
    * in 'fedora.ml'.
@@ -260,16 +266,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