X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile;h=aeb1a74d9e55fe7047e3b6ae12c8ced2f24e257b;hb=14c2539c35635d1c8092295091ddae167512b8be;hp=aad9b85449579e39ce6a61e751fa9bff749c7f03;hpb=5fd36dda74323add27b49491a05312cf844915b8;p=fedora-ocaml-rebuild.git

diff --git a/Goalfile b/Goalfile
index aad9b85..aeb1a74 100644
--- a/Goalfile
+++ b/Goalfile
@@ -60,8 +60,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",
@@ -198,7 +197,6 @@ let packages = [
     "haxe",
     "hevea",
     "hivex",
-    "laby",
     "libguestfs",
     "libnbd",
     "opam",
@@ -225,10 +223,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.