From ff4372e094b875ef1dcf059bc7ea744f7eb1d2ab Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 3 Feb 2022 11:01:30 -0700 Subject: [PATCH] Conditionally build docs to avoid circular dependency on odoc. --- ocaml-ppx-enumerate.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ocaml-ppx-enumerate.spec b/ocaml-ppx-enumerate.spec index 7abf984..61057bf 100644 --- a/ocaml-ppx-enumerate.spec +++ b/ocaml-ppx-enumerate.spec @@ -2,6 +2,9 @@ %global debug_package %{nil} %endif +# Break a circular dependency on ocaml-odoc +%bcond_with doc + %global srcname ppx-enumerate %global upname ppx_enumerate @@ -18,7 +21,10 @@ BuildRequires: ocaml >= 4.08.0 BuildRequires: ocaml-base-devel >= 0.15 BuildRequires: ocaml-dune >= 2.0.0 BuildRequires: ocaml-ppxlib-devel >= 0.23.0 + +%if %{with doc} BuildRequires: ocaml-odoc +%endif %description Ppx_enumerate is a ppx rewriter which generates a definition for the @@ -40,13 +46,17 @@ files for developing applications that use %{name}. %build dune build %{?_smp_mflags} --verbose --profile release +%if %{with doc} dune build %{?_smp_mflags} @doc +%endif %install dune install --destdir=%{buildroot} +%if %{with doc} # We do not want the dune markers find _build/default/_doc/_html -name .dune-keep -delete +%endif # We do not want the ml files find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete @@ -73,7 +83,9 @@ dune runtest --profile release %endif %files devel +%if %{with doc} %doc _build/default/_doc/_html/* +%endif %{_libdir}/ocaml/%{upname}/dune-package %{_libdir}/ocaml/%{upname}/opam %ifarch %{ocaml_native_compiler} @@ -90,6 +102,9 @@ dune runtest --profile release %{_libdir}/ocaml/%{upname}/runtime-lib/*.cmt %changelog +* Thu Feb 3 2022 Jerry James - 0.15.0-3 +- Conditionally build docs to avoid circular dependency on odoc + * Thu Jan 20 2022 Fedora Release Engineering - 0.15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild