Add not-ocamlfind

[fedora-ocaml-rebuild.git] / Goalfile

diff --git a/Goalfile b/Goalfile
index 80760de..bb8ec16 100644 (file)
--- a/Goalfile
+++ b/Goalfile
@@ -6,11 +6,11 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "rawhide"
 #let fedora-branch = "f34"
-let fedora-tag = "f38-build-side-62208"
+let fedora-tag = "f40-build-side-75060"
 
 # The magic string that must appear in %changelog when the
 # package has been rebuilt.
-let fedora-rebuild-name = "Rebuild OCaml packages for F38"
+let fedora-rebuild-name = "OCaml 5.1 rebuild for Fedora 40"
 
 # %fedora-retry-failed:
 # If set to 1 then failed builds are retried automatically.
@@ -27,7 +27,6 @@ let fedora-ignored = [
 # All OCaml-related source package names
 let packages = [
     "ocaml-alcotest",
-    "ocaml-ancient",
     "ocaml-astring",
     "ocaml-atd",
     "ocaml-augeas",
@@ -47,9 +46,8 @@ let packages = [
     "ocaml-camlimages",
     "ocaml-camlp-streams",
     "ocaml-camlp5",
+    "ocaml-camlp5-buildscripts",
     "ocaml-camomile",
-    "ocaml-charinfo-width",
-    "ocaml-cil",
     "ocaml-cinaps",
     "ocaml-cmdliner",
     "ocaml-compiler-libs-janestreet",
@@ -63,15 +61,14 @@ let packages = [
     "ocaml-curses",
     "ocaml-dbus",
     "ocaml-dose3",
-    # Cyclic dependency ocaml-dune -> ocaml-pp -> ocaml-dune
-    #"ocaml-dune",
+    "ocaml-dune",
     "ocaml-easy-format",
     "ocaml-expat",
     "ocaml-extlib",
     "ocaml-facile",
     "ocaml-fieldslib",
     "ocaml-fileutils",
-    "ocaml-findlib",
+    "ocaml-findlib", "not-ocamlfind",
     "ocaml-fmt",
     "ocaml-fpath",
     "ocaml-gen",
@@ -92,7 +89,6 @@ let packages = [
     "ocaml-logs",
     "ocaml-luv",
     "ocaml-lwt",
-    "ocaml-lwt-log",
     "ocaml-markup",
     "ocaml-mccs",
     "ocaml-mdx",
@@ -100,10 +96,8 @@ let packages = [
     "ocaml-merlin",
     "ocaml-mew",
     "ocaml-mew-vi",
-    "ocaml-migrate-parsetree",
     "ocaml-mlgmpidl",
     "ocaml-mlmpfr",
-    "ocaml-mmap",
     "ocaml-mtime",
     "ocamlmod",
     "ocaml-mysql",
@@ -118,13 +112,15 @@ let packages = [
     "ocaml-ocplib-simplex",
     "ocaml-octavius",
     "ocaml-odoc",
-    "ocaml-odoc-parser",
+    # To be retired after 5.1, now merged into ocaml-odoc
+    #"ocaml-odoc-parser",
     "ocaml-omake",
     "ocaml-opam-file-format",
     "ocaml-ounit",
     "ocaml-parmap",
     "ocaml-parsexp",
     "ocaml-pcre",
+    "ocaml-pcre2",
     "ocaml-perl4caml",
     "ocaml-postgresql",
     "ocaml-pp",
@@ -135,10 +131,12 @@ let packages = [
     "ocaml-ppx-custom-printf",
     "ocaml-ppx-derivers",
     "ocaml-ppx-deriving",
+    "ocaml-ppx-deriving-yaml",
     "ocaml-ppx-deriving-yojson",
     "ocaml-ppx-enumerate",
     "ocaml-ppx-expect",
     "ocaml-ppx-fields-conv",
+    "ocaml-ppx-globalize",
     "ocaml-ppx-hash",
     "ocaml-ppx-here",
     "ocaml-ppx-import",
@@ -148,6 +146,7 @@ let packages = [
     "ocaml-ppxlib",
     "ocaml-ppx-optcomp",
     "ocaml-ppx-sexp-conv",
+    "ocaml-ppx-stable-witness",
     "ocaml-ppx-variants-conv",
     "ocaml-psmt2-frontend",
     "ocaml-ptmap",
@@ -161,7 +160,6 @@ let packages = [
     "ocaml-rresult",
     "ocaml-SDL",
     "ocaml-sedlex",
-    "ocaml-seq",
     "ocaml-sexplib",
     "ocaml-sexplib0",
     "ocaml-sha",
@@ -171,15 +169,19 @@ let packages = [
     "ocaml-stdio",
     "ocaml-time-now",
     "ocaml-topkg",
-    "ocaml-tplib",
     "ocaml-trie",
     "ocaml-tyxml",
+    "ocaml-uucd",
+    "ocaml-uucp",
+    "ocaml-uunf",
+    "ocaml-uuseg",
     "ocaml-uutf",
     "ocaml-variantslib",
     "ocaml-version",
     "ocaml-xml-light",
     "ocaml-xmlm",
     "ocaml-xmlrpc-light",
+    "ocaml-yaml",
     "ocaml-yojson",
     "ocaml-zarith",
     "ocaml-zed",
@@ -191,17 +193,19 @@ let packages = [
     "brltty",
     "coccinelle",
     "coq",
+    "emacs-common-tuareg",
     "flocq",
     "frama-c",
     "gappalib-coq",
+    "guestfs-tools",
     "graphviz",
     "haxe",
     "hevea",
     "hivex",
-    "laby",
     "libguestfs",
     "libnbd",
     "opam",
+    "planets",
     "plplot",
     "prooftree",
     "supermin",
@@ -225,10 +229,12 @@ pure function get-source-packages () returning strings = {
     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
+            # Check that the spec file excludes i686.
+            # Only implement this check for ocaml-* packages, as the
+            # other packages are more complicated.
+            if [[ "$spec" =~ ^ocaml ]] &&
+               ! rpmspec -P $spec | grep -sq 'ExcludeArch:.*i386' ; then
+                echo "ERROR: $pkg does not ExcludeArch: %%{ix86}" >&2
                 exit 1
             fi
             # OK to rebuild this package.
@@ -236,7 +242,8 @@ pure function get-source-packages () returning strings = {
         elif [ -f $pkg/%fedora-branch/dead.package ]; then
             echo "WARNING: $pkg: is a dead package, ignored" >&2
         else
-            echo "$pkg: package is not checked out locally" >&2
+            echo "ERROR: $pkg: package is not checked out locally" >&2
+            # This does NOT exit the script, why???
             exit 1
         fi
     done