From 134b5e568d42d5a53b8ae0418da234a33650c11f Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Fri, 6 Mar 2020 11:01:02 -0700
Subject: [PATCH] New version 2.4.0. Add bootstrap conditional for builds
 without ocaml-menhir.

---
 ocaml-dune.spec | 18 ++++++++++++++----
 sources         |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ocaml-dune.spec b/ocaml-dune.spec
index 6a6d48f..b6da0c0 100644
--- a/ocaml-dune.spec
+++ b/ocaml-dune.spec
@@ -1,8 +1,12 @@
 %global libname dune
 
+# Since menhir now requires dune to build, but dune needs menhir only for the
+# tests, build in bootstrap mode to skip the tests and the need for menhir.
+%bcond_with bootstrap
+
 Name:           ocaml-%{libname}
-Version:        2.3.1
-Release:        2%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        A composable build system for OCaml
 
 # Dune itself is MIT.  Some bundled libraries have a different license:
@@ -24,8 +28,10 @@ BuildRequires:  ocaml-findlib
 BuildRequires:  python3dist(sphinx)
 BuildRequires:  python3dist(sphinx-rtd-theme)
 
+%if %{without bootstrap}
 # Required by tests.
 BuildRequires:  ocaml-menhir
+%endif
 
 # Dune has vendored deps (ugh):
 # I'm not clear on how to unbundle them.
@@ -93,12 +99,10 @@ system, a mode to edit dune files, and flymake support for dune files.
 ./dune.exe build @install
 %make_build doc
 
-%ifarch %{ocaml_native_compiler}
 # Relink the stublib.  See https://github.com/ocaml/dune/issues/2977.
 cd _build/default/src/stdune
 ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o stdune_stubs fcntl_stubs.o
 cd -
-%endif
 
 %install
 # "make install" only installs the binary.  We want the libraries, too.
@@ -119,10 +123,12 @@ rm -fr %{buildroot}%{_prefix}/doc
 mkdir -p %{buildroot}%{_pkgdocdir}/
 cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/
 
+%if %{without bootstrap}
 %check
 # These are the only tests we can run.  The others require components that
 # either depend on dune themselves or are not available in Fedora at all.
 %{buildroot}%{_bindir}/dune runtest test/unit-tests
+%endif
 
 %files
 %license LICENSE.md
@@ -182,6 +188,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/
 %{_emacs_sitelispdir}/dune*
 
 %changelog
+* Fri Mar  6 2020 Jerry James <loganjerry@gmail.com> - 2.4.0-1
+- New version 2.4.0
+- Add bootstrap conditional for builds without ocaml-menhir
+
 * Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 2.3.1-2
 - OCaml 4.10.0 final.
 
diff --git a/sources b/sources
index c8c8d50..6189d09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dune-2.3.1.tar.gz) = 2496731d8477e3d603b685616c5474ed704464cca822845c9eb623aa03d4b43caf454fc3d8b1f949360a96363450fb322e5f085305a209af7dc6b3f0f72e5ae0
+SHA512 (dune-2.4.0.tar.gz) = 4e8ecc422cd00b63aca95b9ce2ab16bad6e9ab53a5be991377c932ccaf117c974012ebaaacc6138f3b5b3154d395099c6828fb87b2ba096393db2d82d3f47fee