Add ocaml-pp

[fedora-ocaml-rebuild.git] / Goalfile

diff --git a/Goalfile b/Goalfile
index af2e690..9663e1a 100644 (file)
--- a/Goalfile
+++ b/Goalfile
@@ -6,16 +6,23 @@ 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"
 
 # 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",
+    "opam",
 ]
 
 # All OCaml-related source package names
@@ -23,6 +30,7 @@ let packages = [
     "ocaml-alcotest",
     "ocaml-ancient",
     "ocaml-astring",
+    "ocaml-atd",
     "ocaml-augeas",
     "ocaml-autoconf",
     "ocaml-base",
@@ -119,6 +127,7 @@ let packages = [
     "ocaml-pcre",
     "ocaml-perl4caml",
     "ocaml-postgresql",
+    "ocaml-pp",
     "ocaml-ppx-assert",
     "ocaml-ppx-base",
     "ocaml-ppx-cold",
@@ -165,7 +174,6 @@ let packages = [
     "ocaml-tplib",
     "ocaml-trie",
     "ocaml-tyxml",
-    "ocaml-uuidm",
     "ocaml-uutf",
     "ocaml-variantslib",
     "ocaml-version",
@@ -196,6 +204,7 @@ let packages = [
     "opam",
     "plplot",
     "prooftree",
+    "supermin",
     "utop",
     "virt-top",
     "virt-v2v",
@@ -209,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"
+                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