X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=80760de63d25059a194cb1457a794d841b1a232d;hb=3925b31eba4814bebd7030420224efb82ed79b9a;hp=44e44757c3e7256ea2801f2e0adca0743d631d83;hpb=49350e99fdaeb5caf596e20e3cac8c124d2d7136;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index 44e4475..80760de 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,21 +6,22 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "rawhide"
 #let fedora-branch = "f34"
-let fedora-tag = "f36-build-side-50311"
+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.13.1 rebuild to remove package notes"
+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-opam-file-format",
 ]
 
 # All OCaml-related source package names
@@ -28,6 +29,7 @@ let packages = [
     "ocaml-alcotest",
     "ocaml-ancient",
     "ocaml-astring",
+    "ocaml-atd",
     "ocaml-augeas",
     "ocaml-autoconf",
     "ocaml-base",
@@ -43,6 +45,7 @@ let packages = [
     "ocaml-camlbz2",
     "ocaml-camlidl",
     "ocaml-camlimages",
+    "ocaml-camlp-streams",
     "ocaml-camlp5",
     "ocaml-camomile",
     "ocaml-charinfo-width",
@@ -60,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",
@@ -77,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",
@@ -124,6 +127,7 @@ let packages = [
     "ocaml-pcre",
     "ocaml-perl4caml",
     "ocaml-postgresql",
+    "ocaml-pp",
     "ocaml-ppx-assert",
     "ocaml-ppx-base",
     "ocaml-ppx-cold",
@@ -137,6 +141,7 @@ let packages = [
     "ocaml-ppx-fields-conv",
     "ocaml-ppx-hash",
     "ocaml-ppx-here",
+    "ocaml-ppx-import",
     "ocaml-ppx-inline-test",
     "ocaml-ppx-js-style",
     "ocaml-ppx-let",
@@ -163,14 +168,12 @@ let packages = [
     "ocaml-sqlite",
     "ocaml-ssl",
     "ocaml-stdcompat",
-    "ocaml-stdint",
     "ocaml-stdio",
     "ocaml-time-now",
     "ocaml-topkg",
     "ocaml-tplib",
     "ocaml-trie",
     "ocaml-tyxml",
-    "ocaml-uuidm",
     "ocaml-uutf",
     "ocaml-variantslib",
     "ocaml-version",
@@ -199,11 +202,10 @@ let packages = [
     "libguestfs",
     "libnbd",
     "opam",
-    # plplot dependencies cannot be installed:
-    # https://bugzilla.redhat.com/show_bug.cgi?id=2050480
-    #"plplot",
+    "plplot",
     "prooftree",
     "supermin",
+    "swig",
     "utop",
     "virt-top",
     "virt-v2v",
@@ -226,7 +228,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.