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

diff --git a/Goalfile b/Goalfile
index 174b474..46d8ce5 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,11 +6,17 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "rawhide"
 #let fedora-branch = "f34"
-let fedora-tag = "f36-build-side-46495"
+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 build"
+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.
@@ -23,6 +29,7 @@ let packages = [
     "ocaml-alcotest",
     "ocaml-ancient",
     "ocaml-astring",
+    "ocaml-atd",
     "ocaml-augeas",
     "ocaml-autoconf",
     "ocaml-base",
@@ -38,6 +45,7 @@ let packages = [
     "ocaml-camlbz2",
     "ocaml-camlidl",
     "ocaml-camlimages",
+    "ocaml-camlp-streams",
     "ocaml-camlp5",
     "ocaml-camomile",
     "ocaml-charinfo-width",
@@ -55,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",
@@ -72,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",
@@ -101,7 +109,6 @@ let packages = [
     "ocaml-mysql",
     "ocaml-newt",
     "ocaml-num",
-    "ocaml-oasis",
     "ocaml-obuild",
     "ocaml-ocamlbuild",
     "ocaml-ocamlgraph",
@@ -120,6 +127,7 @@ let packages = [
     "ocaml-pcre",
     "ocaml-perl4caml",
     "ocaml-postgresql",
+    "ocaml-pp",
     "ocaml-ppx-assert",
     "ocaml-ppx-base",
     "ocaml-ppx-cold",
@@ -139,7 +147,6 @@ let packages = [
     "ocaml-ppxlib",
     "ocaml-ppx-optcomp",
     "ocaml-ppx-sexp-conv",
-    "ocaml-ppx-tools",
     "ocaml-ppx-variants-conv",
     "ocaml-psmt2-frontend",
     "ocaml-ptmap",
@@ -167,7 +174,6 @@ let packages = [
     "ocaml-tplib",
     "ocaml-trie",
     "ocaml-tyxml",
-    "ocaml-uuidm",
     "ocaml-uutf",
     "ocaml-variantslib",
     "ocaml-version",
@@ -198,6 +204,7 @@ let packages = [
     "opam",
     "plplot",
     "prooftree",
+    "supermin",
     "utop",
     "virt-top",
     "virt-v2v",
@@ -211,15 +218,24 @@ let packages = [
     #"nbdkit",
 ]
 
+# Get the list of source packages.
 pure function get-source-packages () returning strings = {
     cd %fedora-dir
-    for f in %packages; do
-        if [ -f $f/%fedora-branch/$f.spec ]; then
-            echo "$f"
-        elif [ -f $f/%fedora-branch/dead.package ]; then
-            echo "WARNING: $f: is a dead package, ignored" >&2
+    for pkg in %packages; do
+        spec=$pkg/%fedora-branch/$pkg.spec
+        if [ -f $spec ]; then
+            # 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" >&2
+                exit 1
+            fi
+            # OK to rebuild this package.
+            echo "$pkg"
+        elif [ -f $pkg/%fedora-branch/dead.package ]; then
+            echo "WARNING: $pkg: is a dead package, ignored" >&2
         else
-            echo "$f: package is not checked out locally" >&2
+            echo "$pkg: package is not checked out locally" >&2
             exit 1
         fi
     done