X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=3be286d5c2d6155593937afae269e9a5a5ba5f42;hb=7119720e6fc6d65ad41fad3bedc6bf4940975bb0;hp=ae15e94252f29db8bef9f068611fa2c5a3cf18ae;hpb=e4f752e941abf3f65b790482ce38409430bceb7d;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index ae15e94..3be286d 100644
--- 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 = "f35-build-side-38024"
+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.12.0 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",
@@ -32,10 +40,13 @@ let packages = [
     "ocaml-biniou",
     "ocaml-bin-prot",
     "ocaml-bisect-ppx",
+    "ocaml-bos",
     "ocaml-cairo",
     "ocaml-calendar",
+    "ocaml-camlbz2",
     "ocaml-camlidl",
     "ocaml-camlimages",
+    "ocaml-camlp-streams",
     "ocaml-camlp5",
     "ocaml-camomile",
     "ocaml-charinfo-width",
@@ -53,7 +64,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",
@@ -79,11 +91,13 @@ let packages = [
     "ocaml-lacaml",
     "ocaml-lambda-term",
     "ocaml-libvirt",
+    "ocaml-logs",
     "ocaml-luv",
     "ocaml-lwt",
     "ocaml-lwt-log",
     "ocaml-markup",
     "ocaml-mccs",
+    "ocaml-mdx",
     "ocaml-menhir",
     "ocaml-merlin",
     "ocaml-mew",
@@ -92,11 +106,11 @@ let packages = [
     "ocaml-mlgmpidl",
     "ocaml-mlmpfr",
     "ocaml-mmap",
+    "ocaml-mtime",
     "ocamlmod",
     "ocaml-mysql",
     "ocaml-newt",
     "ocaml-num",
-    "ocaml-oasis",
     "ocaml-obuild",
     "ocaml-ocamlbuild",
     "ocaml-ocamlgraph",
@@ -105,14 +119,17 @@ let packages = [
     "ocaml-ocplib-endian",
     "ocaml-ocplib-simplex",
     "ocaml-octavius",
-    #"ocaml-odoc",    # Causes dep loop.
+    "ocaml-odoc",
+    "ocaml-odoc-parser",
     "ocaml-omake",
     "ocaml-opam-file-format",
     "ocaml-ounit",
+    "ocaml-parmap",
     "ocaml-parsexp",
     "ocaml-pcre",
     "ocaml-perl4caml",
     "ocaml-postgresql",
+    "ocaml-pp",
     "ocaml-ppx-assert",
     "ocaml-ppx-base",
     "ocaml-ppx-cold",
@@ -122,25 +139,27 @@ let packages = [
     "ocaml-ppx-deriving",
     "ocaml-ppx-deriving-yojson",
     "ocaml-ppx-enumerate",
+    "ocaml-ppx-expect",
     "ocaml-ppx-fields-conv",
     "ocaml-ppx-hash",
     "ocaml-ppx-here",
     "ocaml-ppx-inline-test",
     "ocaml-ppx-js-style",
+    "ocaml-ppx-let",
     "ocaml-ppxlib",
     "ocaml-ppx-optcomp",
     "ocaml-ppx-sexp-conv",
-    "ocaml-ppx-tools",
     "ocaml-ppx-variants-conv",
     "ocaml-psmt2-frontend",
     "ocaml-ptmap",
+    "ocaml-pyml",
     "ocaml-qcheck",
     "ocaml-qtest",
     "ocaml-re",
     "ocaml-react",
     "ocaml-res",
     "ocaml-result",
-    "ocaml-rope",
+    "ocaml-rresult",
     "ocaml-SDL",
     "ocaml-sedlex",
     "ocaml-seq",
@@ -149,6 +168,7 @@ let packages = [
     "ocaml-sha",
     "ocaml-sqlite",
     "ocaml-ssl",
+    "ocaml-stdcompat",
     "ocaml-stdint",
     "ocaml-stdio",
     "ocaml-time-now",
@@ -156,9 +176,9 @@ let packages = [
     "ocaml-tplib",
     "ocaml-trie",
     "ocaml-tyxml",
-    "ocaml-uuidm",
     "ocaml-uutf",
     "ocaml-variantslib",
+    "ocaml-version",
     "ocaml-xml-light",
     "ocaml-xmlm",
     "ocaml-xmlrpc-light",
@@ -186,6 +206,7 @@ let packages = [
     "opam",
     "plplot",
     "prooftree",
+    "supermin",
     "utop",
     "virt-top",
     "virt-v2v",
@@ -199,13 +220,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"
+    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