X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=46d8ce5496a5e127b94dd5f49ae5321a6bae6fc5;hb=ed1762cad88a80134fc35f73c47ca41bd6c58bea;hp=7a7f95ff4d378b59da7a65f88af6792735e2aa45;hpb=da984f922bb4dfd240fa92a5df7885d8ea1a1d6f;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 7a7f95f..46d8ce5 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,22 +6,22 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "rawhide"
 #let fedora-branch = "f34"
-let fedora-tag = "f37-build-side-54560"
+let fedora-tag = "f38-build-side-62208"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "OCaml 4.14.0 rebuild"
+let fedora-rebuild-name = "Rebuild OCaml packages for F38"
+
+# %fedora-retry-failed:
+# If set to 1 then failed builds are retried automatically.
+# If set to 0 then failed builds must be manually restarted.
+# Normally you want this to be 0.
+let fedora-retry-failed = "1"
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
 let fedora-ignored = [
     "ocaml-srpm-macros", "ocaml",
-
-    # These use rpmautospec and must be rebuilt by hand for now.
-    # XXX eventually need to fix stdlib/fedora.gl to deal with these
-    "ocaml-base64",
-    "ocaml-dose3",
-    "ocaml-opam-file-format",
 ]
 
 # All OCaml-related source package names
@@ -29,6 +29,7 @@ let packages = [
     "ocaml-alcotest",
     "ocaml-ancient",
     "ocaml-astring",
+    "ocaml-atd",
     "ocaml-augeas",
     "ocaml-autoconf",
     "ocaml-base",
@@ -44,6 +45,7 @@ let packages = [
     "ocaml-camlbz2",
     "ocaml-camlidl",
     "ocaml-camlimages",
+    "ocaml-camlp-streams",
     "ocaml-camlp5",
     "ocaml-camomile",
     "ocaml-charinfo-width",
@@ -61,7 +63,8 @@ let packages = [
     "ocaml-curses",
     "ocaml-dbus",
     "ocaml-dose3",
-    "ocaml-dune",
+    # Cyclic dependency ocaml-dune -> ocaml-pp -> ocaml-dune
+    #"ocaml-dune",
     "ocaml-easy-format",
     "ocaml-expat",
     "ocaml-extlib",
@@ -78,7 +81,6 @@ let packages = [
     "ocamlify",
     "ocaml-integers",
     "ocaml-jane-street-headers",
-#   "ocaml-jsonm", https://bugzilla.redhat.com/show_bug.cgi?id=1183825
     "ocaml-jst-config",
     "ocaml-lablgl",
     "ocaml-lablgtk",
@@ -125,6 +127,7 @@ let packages = [
     "ocaml-pcre",
     "ocaml-perl4caml",
     "ocaml-postgresql",
+    "ocaml-pp",
     "ocaml-ppx-assert",
     "ocaml-ppx-base",
     "ocaml-ppx-cold",
@@ -171,7 +174,6 @@ let packages = [
     "ocaml-tplib",
     "ocaml-trie",
     "ocaml-tyxml",
-    "ocaml-uuidm",
     "ocaml-uutf",
     "ocaml-variantslib",
     "ocaml-version",
@@ -225,7 +227,7 @@ pure function get-source-packages () returning strings = {
             # Check that all spec files have disabled the broken
             # "package notes" misfeature.
             if ! grep -sq "%%undefine _package_note_flags" $spec ; then
-                echo "ERROR: $pkg does not %%undefine _package_note_flags"
+                echo "ERROR: $pkg does not %%undefine _package_note_flags" >&2
                 exit 1
             fi
             # OK to rebuild this package.