diff --git a/ocaml-dune-no-lwt.patch b/ocaml-dune-no-lwt.patch index 201dac2..51cabf2 100644 --- a/ocaml-dune-no-lwt.patch +++ b/ocaml-dune-no-lwt.patch @@ -1,5 +1,5 @@ ---- dune-3.7.0/dune-file.orig 2023-02-17 07:44:16.000000000 -0700 -+++ dune-3.7.0/dune-file 2023-02-18 13:34:33.294759108 -0700 +--- dune-3.15.0/dune-file.orig 2024-04-03 03:29:40.000000000 -0600 ++++ dune-3.15.0/dune-file 2024-04-05 08:48:56.083804773 -0600 @@ -30,9 +30,6 @@ (copy dune-private-libs.opam.template ordering.opam.template)) @@ -10,9 +10,9 @@ (copy dune-private-libs.opam.template fiber.opam.template)) (rule ---- dune-3.7.0/dune-project.orig 2023-02-17 07:44:16.000000000 -0700 -+++ dune-3.7.0/dune-project 2023-02-18 13:34:52.868400083 -0700 -@@ -147,17 +147,6 @@ understood by dune language.")) +--- dune-3.15.0/dune-project.orig 2024-04-03 03:29:40.000000000 -0600 ++++ dune-3.15.0/dune-project 2024-04-05 08:49:50.546090649 -0600 +@@ -149,16 +149,6 @@ understood by dune language.")) (description "Library to connect and control a running dune instance")) (package @@ -20,9 +20,8 @@ - (synopsis "Communicate with dune using rpc and Lwt") - (depends - (dune-rpc (= :version)) -- (result (>= 1.5)) - (csexp (>= 1.5.0)) -- (lwt (>= 5.3.0)) +- (lwt (>= 5.6.0)) - base-unix) - (description "Specialization of dune-rpc to Lwt")) - diff --git a/ocaml-dune.spec b/ocaml-dune.spec index ad64750..f8128c6 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,7 +8,7 @@ %bcond lwt 0 Name: ocaml-dune -Version: 3.14.2 +Version: 3.15.0 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -56,10 +56,11 @@ BuildRequires: ocaml-pp-devel >= 1.2.0 BuildRequires: ocaml-rpm-macros BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-copybutton} +BuildRequires: %{py3_dist sphinx-design} BuildRequires: %{py3_dist sphinx-rtd-theme} %if %{with lwt} -BuildRequires: ocaml-lwt-devel +BuildRequires: ocaml-lwt-devel >= 5.6.0 %endif # Dune has vendored deps to avoid dependency cycles. Upstream deliberately @@ -116,7 +117,6 @@ productive. %package doc # The content is MIT. Other licenses are due to files added by sphinx. # BSD-2-Clause: -# - _static/_sphinx_javascript_frameworks_compat.js # - _static/basic.css # - _static/doctools.js # - _static/documentation_options.js @@ -127,17 +127,20 @@ productive. # - _static/searchtools.js # - _static/sphinx_highlight.js # MIT: +# - _static/check-solid.svg +# - _static/clipboard.min.js +# - _static/copy-button.svg +# - _static/copybutton.css +# - _static/copybutton.js +# - _static/copybutton_funcs.js +# - _static/design-style.*.min.css +# - _static/design-tabs.js # - _static/css -# - _static/jquery* # - _static/js -# - _static/underscore* License: MIT AND BSD-2-Clause Summary: HTML documentation for %{name} BuildArch: noarch -Provides: bundled(js-jquery) = 3.6.0 -Provides: bundled(js-underscore) = 1.13.1 - %description doc HTML documentation for dune, a composable build system for OCaml. @@ -313,7 +316,6 @@ Requires: %{name}-rpc-lwt%{?_isa} = %{version}-%{release} Requires: %{name}-rpc-devel%{?_isa} = %{version}-%{release} Requires: ocaml-csexp-devel%{?_isa} Requires: ocaml-lwt-devel%{?_isa} -Requires: ocaml-result-devel%{?_isa} %description rpc-lwt-devel The ocaml-dune-rpc-lwt-devel package contains libraries and signature @@ -574,6 +576,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri Apr 5 2024 Jerry James - 3.15.0-1 +- Version 3.15.0 + * Thu Mar 14 2024 Jerry James - 3.14.2-1 - Version 3.14.2 diff --git a/sources b/sources index 139c04a..7d5b68c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.14.2.tar.gz) = 33079fce72a86e6d4c0d33686b17c7056bd361959d3873f8bb5fc3d1993341c4645b2f389944a2e0a071243a7f22936bdcb28261dae79b517cf14aa230af448c +SHA512 (dune-3.15.0.tar.gz) = 1a48e70157ecf697ab490d05863cd8936978d7aac71e3cf16b3bd1c0de37442c65261df0906d2daba75ad66f1b7463af26f00c7c4fb7c17a6505375505b21d13