X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=bb8ec16807f25dd05d8709fc36386cf777a4e4a9;hb=8a35177fcb7f24c8e01e2c59683c222ad87a2542;hp=a41fa96918132d91e3494f9df165a6f68efcb0c4;hpb=928ef8b0a5851bf86f13c2ebdd9b8a97fedd3341;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index a41fa96..bb8ec16 100644
--- 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 = "f39-build-side-69760"
+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 = "OCaml 5.0 rebuild for Fedora 39"
+let fedora-rebuild-name = "OCaml 5.1 rebuild for Fedora 40"
 
 # %fedora-retry-failed:
 # If set to 1 then failed builds are retried automatically.
@@ -46,6 +46,7 @@ let packages = [
     "ocaml-camlimages",
     "ocaml-camlp-streams",
     "ocaml-camlp5",
+    "ocaml-camlp5-buildscripts",
     "ocaml-camomile",
     "ocaml-cinaps",
     "ocaml-cmdliner",
@@ -60,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",
@@ -112,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",
@@ -191,9 +193,11 @@ let packages = [
     "brltty",
     "coccinelle",
     "coq",
+    "emacs-common-tuareg",
     "flocq",
     "frama-c",
     "gappalib-coq",
+    "guestfs-tools",
     "graphviz",
     "haxe",
     "hevea",
@@ -201,6 +205,7 @@ let packages = [
     "libguestfs",
     "libnbd",
     "opam",
+    "planets",
     "plplot",
     "prooftree",
     "supermin",
@@ -224,14 +229,11 @@ 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
-                exit 1
-            fi
             # Check that the spec file excludes i686.
-            if ! rpmspec -P $spec | grep -sq 'ExcludeArch:.*i386' ; then
+            # 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
@@ -240,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