X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=2ef7879f3edc21a6052fef8ef1d9659b712f7436;hb=825247094504391f0d9043c4f31af1d84ebc748f;hp=af2e690e2464fdd44f632a262ea7960672afccf1;hpb=72c1d76bc2b6429bde2e826147cef67ed7bd9248;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index af2e690..2ef7879 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 = "f36-build-side-46495"
+let fedora-tag = "f36-build-side-50311"
 
 # 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 = "OCaml 4.13.1 rebuild to remove package notes"
 
 # Packages that are ignored, which means they are treated as if
 # they have been rebuilt.
@@ -209,15 +209,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