diff --git a/dune-3.18.1.tar.gz b/dune-3.18.1.tar.gz deleted file mode 100644 index 41ffcb7a988e4b15f7d45160578d30cc8b3199f8..0000000000000000000000000000000000000000 Binary files a/dune-3.18.1.tar.gz and /dev/null differ diff --git a/dune-3.19.1.tar.gz b/dune-3.19.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..112906b0a4e23c081e66253f887d755eeb8e20fa Binary files /dev/null and b/dune-3.19.1.tar.gz differ diff --git a/ocaml-dune-debuginfo.patch b/ocaml-dune-debuginfo.patch index 8917c711c00ba805544bfc1c4504b6586f0771da..f3982f36066f59f86a3c8f7de8fd7e26cc03743e 100644 --- a/ocaml-dune-debuginfo.patch +++ b/ocaml-dune-debuginfo.patch @@ -1,6 +1,6 @@ ---- dune-3.11.0/src/dune_rules/dune_project.ml.orig 2023-09-23 19:52:10.552217543 -0600 -+++ dune-3.11.0/src/dune_rules/dune_project.ml 2023-09-23 22:03:32.641347776 -0600 -@@ -455,7 +455,7 @@ let filename = "dune-project" +--- dune-3.19.0/src/source/dune_project.ml.orig 2025-05-21 09:55:32.000000000 -0600 ++++ dune-3.19.0/src/source/dune_project.ml 2025-05-23 10:08:59.062547002 -0600 +@@ -336,7 +336,7 @@ let filename = "dune-project" let opam_file_location_default ~lang:_ = `Relative_to_project let implicit_transitive_deps_default ~lang:_ = true let wrapped_executables_default ~(lang : Lang.Instance.t) = lang.version >= (2, 0) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 4c7958b994e6850dedcc59d98c18e2f25c88c36f..1693797bc0586baf8a9d6a206b0e90c43a2a54b4 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -4,7 +4,7 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.18.1 +Version: 3.19.1 Release: 1 Summary: Composable build system for OCaml and Reason @@ -31,10 +31,10 @@ URL: https://dune.build VCS: git:%{giturl}.git Source: %{giturl}/archive/%{version}/dune-%{version}.tar.gz # When building without lwt, remove libraries that need it -Patch: %{name}-no-lwt.patch +Patch0: %{name}-no-lwt.patch # Temporary workaround for broken debuginfo (rhbz#2168932) # See https://github.com/ocaml/dune/issues/6929 -Patch: %{name}-debuginfo.patch +Patch1: %{name}-debuginfo.patch # OCaml packages not built on i686 since OCaml 5. ExcludeArch: %{ix86} @@ -67,7 +67,7 @@ Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eec Provides: bundled(ocaml-inotify) = 2.3 Provides: bundled(ocaml-lwd) = 0.3 Provides: bundled(ocaml-notty) = 0.2.3 -Provides: bundled(ocaml-opam) = 2.2.0~alpha2 +Provides: bundled(ocaml-opam) = 2.2.0 Provides: bundled(ocaml-opam-file-format) = 2.1.6 Provides: bundled(ocaml-re) = 1.11.0 Provides: bundled(ocaml-sha) = 1.15.4 @@ -562,6 +562,16 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Jun 25 2025 yaoxin <1024769339@qq.com> - 3.19.1-1 +- Update to 3.19.1: + * Revert changes in dune exec behaviour introduced in 3.19.0. + * Fixed a bug that was causing cram tests attached to multiple + aliases to be run multiple times. + * Fix $ dune describe pp for libraries in the presence of + (include_subdirs unqualified) + * Fix $ dune subst in sub directories of a git repository + * fix compatibility with ocaml.5.4.0 by avoiding shadowing sigwinch + * Wed Apr 23 2025 wangkai <13474090681@163.com> - 3.18.1-1 - Update to 3.18.1