From 7d172c2d7533632bc03f99c869ac354c163e6e41 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Sat, 17 Jul 2021 13:08:20 -0600
Subject: [PATCH] Version 2.9.0.

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

diff --git a/ocaml-dune.spec b/ocaml-dune.spec
index 05b4fbd..9637141 100644
--- a/ocaml-dune.spec
+++ b/ocaml-dune.spec
@@ -5,8 +5,8 @@
 %bcond_without menhir
 
 Name:           ocaml-%{libname}
-Version:        2.8.5
-Release:        2%{?dist}
+Version:        2.9.0
+Release:        1%{?dist}
 Summary:        A composable build system for OCaml
 
 # Dune itself is MIT.  Some bundled libraries have a different license:
@@ -94,7 +94,11 @@ system, a mode to edit dune files, and flymake support for dune files.
 %autosetup -n %{libname}-%{version} -p1
 
 %build
-./configure --libdir %{_libdir}/ocaml --mandir %{_mandir}
+# Also set --docdir when we are ready to migrate all ocaml packages
+./configure \
+  --etcdir %{_sysconfdir} \
+  --libdir %{_libdir}/ocaml \
+  --mandir %{_mandir}
 
 # This command fails, because ppx_bench, ppx_expect, and core_bench are missing.
 # However, it is only tests that fail, not the actual build, so ignore the
@@ -116,11 +120,6 @@ cd -
 # "make install" only installs the binary.  We want the libraries, too.
 ./dune.exe install --destdir %{buildroot}
 
-%ifarch %{ocaml_native_compiler}
-# Add missing executable bits
-find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod 0755 {} \+
-%endif
-
 # Byte compile the Emacs files
 cd %{buildroot}%{_emacs_sitelispdir}
 %_emacs_bytecompile dune.el dune-flymake.el
@@ -210,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/
 %{_emacs_sitelispdir}/dune*
 
 %changelog
+* Sat Jul 17 2021 Jerry James <loganjerry@gmail.com> - 2.9.0-1
+- Version 2.9.0
+
 * Tue Mar 30 2021 Richard W.M. Jones <rjones@redhat.com> - 2.8.5-2
 - Bump and rebuild for ELN.
 
diff --git a/sources b/sources
index aed4340..7ba9226 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dune-2.8.5.tar.gz) = 4d0d8611aeb945afdff4319d7195e3b84e1896e64010a2809ca59d3e0721eded3e7c560cf28ea19c93f5a82b1843d97165751060a6b2425c8db9a7cfc17d6e32
+SHA512 (dune-2.9.0.tar.gz) = 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24