X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=964121b27d701ea40ca6962a999fbb6fdbd35931;hb=eedc74f8e10f68905779370cc936b0a11ea35282;hp=cc0d259feaf422f641b1da90d08fabc0fca7a5ce;hpb=40c1edf77a5ecc58628c252170848a40f9112402;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index cc0d259..964121b 100644
--- a/Goalfile
+++ b/Goalfile
@@ -6,29 +6,27 @@ let fedora-dir = "%HOME/d/fedora"
 
 let fedora-branch = "rawhide"
 #let fedora-branch = "f34"
-let fedora-tag = "f38-build-side-62208"
+let fedora-tag = "f39-build-side-69760"
 
 # 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.0 rebuild for Fedora 39"
+
+# %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-dose3",
-    "ocaml-opam-file-format",
-    "opam",
 ]
 
 # All OCaml-related source package names
 let packages = [
     "ocaml-alcotest",
-    "ocaml-ancient",
     "ocaml-astring",
     "ocaml-atd",
     "ocaml-augeas",
@@ -47,10 +45,9 @@ let packages = [
     "ocaml-camlidl",
     "ocaml-camlimages",
     "ocaml-camlp-streams",
-    "ocaml-camlp5",
+    # Waiting on two dependencies to be reviewed
+    #"ocaml-camlp5",
     "ocaml-camomile",
-    "ocaml-charinfo-width",
-    "ocaml-cil",
     "ocaml-cinaps",
     "ocaml-cmdliner",
     "ocaml-compiler-libs-janestreet",
@@ -64,8 +61,7 @@ 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",
@@ -82,7 +78,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",
@@ -94,7 +89,6 @@ let packages = [
     "ocaml-logs",
     "ocaml-luv",
     "ocaml-lwt",
-    "ocaml-lwt-log",
     "ocaml-markup",
     "ocaml-mccs",
     "ocaml-mdx",
@@ -102,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",
@@ -137,18 +129,22 @@ 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",
     "ocaml-ppx-inline-test",
     "ocaml-ppx-js-style",
     "ocaml-ppx-let",
     "ocaml-ppxlib",
     "ocaml-ppx-optcomp",
     "ocaml-ppx-sexp-conv",
+    "ocaml-ppx-stable-witness",
     "ocaml-ppx-variants-conv",
     "ocaml-psmt2-frontend",
     "ocaml-ptmap",
@@ -162,26 +158,28 @@ let packages = [
     "ocaml-rresult",
     "ocaml-SDL",
     "ocaml-sedlex",
-    "ocaml-seq",
     "ocaml-sexplib",
     "ocaml-sexplib0",
     "ocaml-sha",
     "ocaml-sqlite",
     "ocaml-ssl",
     "ocaml-stdcompat",
-    "ocaml-stdint",
     "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",
@@ -196,17 +194,20 @@ let packages = [
     "flocq",
     "frama-c",
     "gappalib-coq",
-    "graphviz",
-    "haxe",
+    # Depends on swig:
+    #"graphviz",
+    # Depends on camlp5:
+    #"haxe",
     "hevea",
     "hivex",
-    "laby",
     "libguestfs",
     "libnbd",
     "opam",
     "plplot",
     "prooftree",
     "supermin",
+    # Tests fail for unclear reasons.
+    #"swig",
     "utop",
     "virt-top",
     "virt-v2v",
@@ -226,10 +227,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"
+            # 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.