From 50825add7a36eb0ecbf63898193acb040b4c008a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:07:09 +0000 Subject: [PATCH 01/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index cbc1410..1a32a03 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,7 +11,7 @@ Name: ocaml-dune Version: 3.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -557,6 +557,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 3.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Nov 25 2022 Jerry James - 3.6.1-1 - Version 3.6.1 From cf706e9f8ca7613690eb5eb6ae7065759512f3c3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 24 Jan 2023 08:50:16 +0000 Subject: [PATCH 02/58] Rebuild OCaml packages for F38 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 1a32a03..2a95f7b 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,7 +11,7 @@ Name: ocaml-dune Version: 3.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -557,6 +557,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Jan 24 2023 Richard W.M. Jones - 3.6.1-3 +- Rebuild OCaml packages for F38 + * Thu Jan 19 2023 Fedora Release Engineering - 3.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 2d82b286c5f5d6dfdf1b5877776d4e1c82357e48 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 18 Feb 2023 13:47:36 -0700 Subject: [PATCH 03/58] Version 3.7.0. The fiber subpackage has been removed. --- ocaml-dune-no-lwt.patch | 12 ++++++------ ocaml-dune.spec | 40 ++++++++++++++-------------------------- sources | 2 +- 3 files changed, 21 insertions(+), 33 deletions(-) diff --git a/ocaml-dune-no-lwt.patch b/ocaml-dune-no-lwt.patch index cc96d4d..201dac2 100644 --- a/ocaml-dune-no-lwt.patch +++ b/ocaml-dune-no-lwt.patch @@ -1,6 +1,6 @@ ---- dune-3.3.1/dune.orig 2022-06-19 11:20:42.000000000 -0600 -+++ dune-3.3.1/dune 2022-06-25 13:22:05.768505945 -0600 -@@ -26,9 +26,6 @@ +--- 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 +@@ -30,9 +30,6 @@ (copy dune-private-libs.opam.template ordering.opam.template)) (rule @@ -10,9 +10,9 @@ (copy dune-private-libs.opam.template fiber.opam.template)) (rule ---- dune-3.3.1/dune-project.orig 2022-06-19 11:20:42.000000000 -0600 -+++ dune-3.3.1/dune-project 2022-06-25 13:24:12.903696002 -0600 -@@ -144,17 +144,6 @@ understood by dune language.")) +--- 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.")) (description "Library to connect and control a running dune instance")) (package diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 2a95f7b..816b091 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -10,8 +10,8 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.6.1 -Release: 3%{?dist} +Version: 3.7.0 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -38,6 +38,7 @@ BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-csexp-devel >= 1.5.0 BuildRequires: ocaml-pp-devel >= 1.1.0 BuildRequires: %{py3_dist sphinx} +BuildRequires: %{py3_dist sphinx-copybutton} BuildRequires: %{py3_dist sphinx-rtd-theme} %if %{with lwt} @@ -47,7 +48,7 @@ BuildRequires: ocaml-lwt-devel # Dune has vendored deps to avoid dependency cycles. Upstream deliberately # does not support unbundling these dependencies. # See https://github.com/ocaml/dune/issues/220 -Provides: bundled(ocaml-build-path-prefix-map) = 0.2 +Provides: bundled(ocaml-build-path-prefix-map) = 0.3 Provides: bundled(ocaml-cmdliner) = 1.1.1 Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 Provides: bundled(ocaml-inotify) = 2.3 @@ -63,6 +64,12 @@ Requires: python3 # Both packages install a binary named dune and an associated man page Conflicts: wdune +# This can be removed when F42 reaches EOL +Obsoletes: ocaml-fiber < 3.7.0 +Obsoletes: ocaml-fiber-devel < 3.7.0 +Provides: ocaml-fiber = %{version}-%{release} +Provides: ocaml-fiber-devel = %{version}-%{release} + # Install documentation in the main package doc directory %global _docdir_fmt %{name} @@ -343,25 +350,6 @@ Requires: ocaml-pp-devel%{?_isa} The ocaml-dyn-devel package contains libraries and signature files for developing applications that use ocaml-dyn. -%package -n ocaml-fiber -Summary: Structured concurrency library -License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: ocaml-stdune%{?_isa} = %{version}-%{release} - -%description -n ocaml-fiber -A structured concurrency library for OCaml. - -%package -n ocaml-fiber-devel -Summary: Development files for ocaml-fiber -License: MIT -Requires: ocaml-fiber%{?_isa} = %{version}-%{release} -Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} - -%description -n ocaml-fiber-devel -The ocaml-fiber-devel package contains libraries and signature files for -developing applications that use ocaml-fiber. - %package -n ocaml-ocamlc-loc Summary: Parse OCaml compiler output into structured form License: MIT @@ -536,10 +524,6 @@ cd - %files -n ocaml-dyn-devel -f .ofiles-dyn-devel -%files -n ocaml-fiber -f .ofiles-fiber - -%files -n ocaml-fiber-devel -f .ofiles-fiber-devel - %files -n ocaml-ocamlc-loc -f .ofiles-ocamlc-loc %files -n ocaml-ocamlc-loc-devel -f .ofiles-ocamlc-loc-devel @@ -557,6 +541,10 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Sat Feb 18 2023 Jerry James - 3.7.0-1 +- Version 3.7.0 +- The fiber subpackage has been removed + * Tue Jan 24 2023 Richard W.M. Jones - 3.6.1-3 - Rebuild OCaml packages for F38 diff --git a/sources b/sources index fd78c25..f062cd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.6.1.tar.gz) = 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 +SHA512 (dune-3.7.0.tar.gz) = f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239 From 7995f539abfcc4099c2788195fe98cb9b81de77c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 21 Mar 2023 10:25:09 -0600 Subject: [PATCH 04/58] Add debuginfo patch to produce good debuginfo again --- ocaml-dune-debuginfo.patch | 11 +++++++++++ ocaml-dune.spec | 9 +++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 ocaml-dune-debuginfo.patch diff --git a/ocaml-dune-debuginfo.patch b/ocaml-dune-debuginfo.patch new file mode 100644 index 0000000..56a2abe --- /dev/null +++ b/ocaml-dune-debuginfo.patch @@ -0,0 +1,11 @@ +--- dune-3.7.0/src/dune_engine/dune_project.ml.orig 2023-02-17 07:44:16.000000000 -0700 ++++ dune-3.7.0/src/dune_engine/dune_project.ml 2023-03-21 10:01:16.334828478 -0600 +@@ -457,7 +457,7 @@ let implicit_transitive_deps_default ~la + let wrapped_executables_default ~(lang : Lang.Instance.t) = + lang.version >= (2, 0) + +-let map_workspace_root_default ~(lang : Lang.Instance.t) = lang.version >= (3, 0) ++let map_workspace_root_default ~(lang : Lang.Instance.t) = false + + let executables_implicit_empty_intf_default ~(lang : Lang.Instance.t) = + lang.version >= (3, 0) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 816b091..c14e99b 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -31,6 +31,9 @@ URL: https://dune.build Source0: https://github.com/ocaml/dune/archive/%{version}/dune-%{version}.tar.gz # When building without lwt, remove libraries that need it Patch0: %{name}-no-lwt.patch +# Temporary workaround for broken debuginfo (rhbz#2168932) +# See https://github.com/ocaml/dune/issues/6929 +Patch1: %{name}-debuginfo.patch BuildRequires: emacs-nox BuildRequires: make @@ -426,9 +429,10 @@ developing applications that use ocaml-xdg. %prep %autosetup -N -n dune-%{version} %if %{without lwt} -%patch0 -p1 +%patch 0 -p1 rm -fr otherlibs/dune-rpc-lwt dune-rpc-lwt.opam %endif +%autopatch -m1 -p1 %build ./configure \ @@ -541,9 +545,10 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog -* Sat Feb 18 2023 Jerry James - 3.7.0-1 +* Tue Mar 21 2023 Jerry James - 3.7.0-1 - Version 3.7.0 - The fiber subpackage has been removed +- Add debuginfo patch to produce good debuginfo again * Tue Jan 24 2023 Richard W.M. Jones - 3.6.1-3 - Rebuild OCaml packages for F38 From cfd816c53a70688c67e354077ff1f6097642c550 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 24 Mar 2023 10:59:58 -0600 Subject: [PATCH 05/58] Rebuild for ocaml-csexp 1.5.2 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index c14e99b..5968295 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,7 +11,7 @@ Name: ocaml-dune Version: 3.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -545,6 +545,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri Mar 24 2023 Jerry James - 3.7.0-2 +- Rebuild for ocaml-csexp 1.5.2 + * Tue Mar 21 2023 Jerry James - 3.7.0-1 - Version 3.7.0 - The fiber subpackage has been removed From 28ee4aaef964d5b282d69fb3e796f5eb096aa979 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 4 Apr 2023 10:38:35 -0600 Subject: [PATCH 06/58] Version 3.7.1 --- ocaml-dune.spec | 12 +++++++++--- sources | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 5968295..42c926f 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -10,8 +10,8 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.7.0 -Release: 2%{?dist} +Version: 3.7.1 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -429,11 +429,14 @@ developing applications that use ocaml-xdg. %prep %autosetup -N -n dune-%{version} %if %{without lwt} -%patch 0 -p1 +%autopatch 0 -p1 rm -fr otherlibs/dune-rpc-lwt dune-rpc-lwt.opam %endif %autopatch -m1 -p1 +# Allow use of Sphinx 6 +sed -i 's/, < 6//'g doc/requirements.txt + %build ./configure \ --bindir %{_bindir} \ @@ -545,6 +548,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Apr 4 2023 Jerry James - 3.7.1-1 +- Version 3.7.1 + * Fri Mar 24 2023 Jerry James - 3.7.0-2 - Rebuild for ocaml-csexp 1.5.2 diff --git a/sources b/sources index f062cd9..672e122 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.7.0.tar.gz) = f83d55939513cf292d89cbc38dbe2431cf453c5d5cfdab2239946e2845d10ea57be8643bb8047fe82499bb21561e861dcd8b749c55a1ba18377996c6a0b48239 +SHA512 (dune-3.7.1.tar.gz) = d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b From 946f11170e1436af07ecf90e1db90d39bce5083a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 9 Jun 2023 16:18:32 -0600 Subject: [PATCH 07/58] Version 3.8.1 Add LGPL-2.1-or-later to License tag due to bundled 0install-solver --- ocaml-dune-debuginfo.patch | 6 +++--- ocaml-dune.spec | 25 ++++++++++++++++++++++--- sources | 2 +- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ocaml-dune-debuginfo.patch b/ocaml-dune-debuginfo.patch index 56a2abe..8cb3cb3 100644 --- a/ocaml-dune-debuginfo.patch +++ b/ocaml-dune-debuginfo.patch @@ -1,6 +1,6 @@ ---- dune-3.7.0/src/dune_engine/dune_project.ml.orig 2023-02-17 07:44:16.000000000 -0700 -+++ dune-3.7.0/src/dune_engine/dune_project.ml 2023-03-21 10:01:16.334828478 -0600 -@@ -457,7 +457,7 @@ let implicit_transitive_deps_default ~la +--- dune-3.8.1/src/dune_rules/dune_project.ml.orig 2023-06-05 10:33:12.000000000 -0600 ++++ dune-3.8.1/src/dune_rules/dune_project.ml 2023-06-09 15:43:53.671558827 -0600 +@@ -465,7 +465,7 @@ let implicit_transitive_deps_default ~la let wrapped_executables_default ~(lang : Lang.Instance.t) = lang.version >= (2, 0) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 42c926f..1b3e6cb 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -10,23 +10,31 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.7.1 +Version: 3.8.1 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: # ISC: # - vendor/cmdliner +# - vendor/fmt +# - vendor/notty +# - vendor/opam-0install +# - vendor/sha +# - vendor/uutf # LGPL-2.0-only: # - vendor/incremental-cycles # LGPL-2.0-only WITH OCaml-LGPL-linking-exception # - vendor/ocaml-inotify +# - vendor/opam # - vendor/opam-file-format # - vendor/re +# LGPL-2.1-or-later: +# - vendor/0install-solver # MIT: # - vendor/build_path_prefix_map # - vendor/spawn -License: MIT AND ISC AND LGPL-2.0-only AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception +License: MIT AND ISC AND LGPL-2.0-only AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception AND LGPL-2.1-or-later URL: https://dune.build Source0: https://github.com/ocaml/dune/archive/%{version}/dune-%{version}.tar.gz # When building without lwt, remove libraries that need it @@ -51,13 +59,20 @@ BuildRequires: ocaml-lwt-devel # Dune has vendored deps to avoid dependency cycles. Upstream deliberately # does not support unbundling these dependencies. # See https://github.com/ocaml/dune/issues/220 +Provides: bundled(ocaml-0install-solver) = 2.18 Provides: bundled(ocaml-build-path-prefix-map) = 0.3 Provides: bundled(ocaml-cmdliner) = 1.1.1 +Provides: bundled(ocaml-fmt) = 0.8.10 Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 Provides: bundled(ocaml-inotify) = 2.3 -Provides: bundled(ocaml-opam-file-format) = 2.0.0 +Provides: bundled(ocaml-notty) = 0.2.3 +Provides: bundled(ocaml-opam) = 2.1.4 +Provides: bundled(ocaml-opam-0install) = 0.4.3 +Provides: bundled(ocaml-opam-file-format) = 2.1.6 Provides: bundled(ocaml-re) = 1.9.0 +Provides: bundled(ocaml-sha) = 1.15.4 Provides: bundled(ocaml-spawn) = 0.15.1 +Provides: bundled(ocaml-uutf) = 1.0.3 Provides: dune = %{version}-%{release} @@ -548,6 +563,10 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri Jun 9 2023 Jerry James - 3.8.1-1 +- Version 3.8.1 +- Add LGPL-2.1-or-later to License tag due to bundled 0install-solver + * Tue Apr 4 2023 Jerry James - 3.7.1-1 - Version 3.7.1 diff --git a/sources b/sources index 672e122..48681f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.7.1.tar.gz) = d741b2a92e970f9747240d4356045f46447238f7c8d8c47ba0b1cad96b8194461a47fa315d86a1eef2033a4d38001c999e6033c31b0c75a311367fb78ea12b6b +SHA512 (dune-3.8.1.tar.gz) = 22e0f15df8878b7cfe2bf38a1ea1e88b4aea4d9b6f7e6ff60b5766c7c6d498f8af98965215fc9f3c23bde15b46317482137990d3df499df0a8d3ed14183ea5f2 From ba5707b2bd98560c1b3ab6abe3ffa299a3bcf7c3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 10 Jul 2023 14:24:27 -0600 Subject: [PATCH 08/58] Version 3.9.1 --- ocaml-dune.spec | 10 +++++++--- sources | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 1b3e6cb..7f580ac 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -3,14 +3,12 @@ # checkout, and has access to the Internet. We cannot satisfy any of these # conditions on a koji builder, so we do not run the test suite. -%undefine _package_note_flags - # One of the dune libraries now depends on lwt. We do not currently need that # library in Fedora, so don't build it. %bcond_with lwt Name: ocaml-dune -Version: 3.8.1 +Version: 3.9.1 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -91,6 +89,9 @@ Provides: ocaml-fiber-devel = %{version}-%{release} # Install documentation in the main package doc directory %global _docdir_fmt %{name} +# Do not require ocaml-compiler-libs at runtime +%global __ocaml_requires_opts -i Asttypes -i Build_path_prefix_map -i Cmi_format -i Env -i Ident -i Identifiable -i Load_path -i Location -i Longident -i Misc -i Outcometree -i Parsetree -i Path -i Primitive -i Shape -i Subst -i Topdirs -i Toploop -i Type_immediacy -i Types -i Warnings + %description Dune is a build system designed for OCaml/Reason projects only. It focuses on providing the user with a consistent experience and takes care of most of @@ -563,6 +564,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Mon Jul 10 2023 Jerry James - 3.9.1-1 +- Version 3.9.1 + * Fri Jun 9 2023 Jerry James - 3.8.1-1 - Version 3.8.1 - Add LGPL-2.1-or-later to License tag due to bundled 0install-solver diff --git a/sources b/sources index 48681f7..fd3bca4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.8.1.tar.gz) = 22e0f15df8878b7cfe2bf38a1ea1e88b4aea4d9b6f7e6ff60b5766c7c6d498f8af98965215fc9f3c23bde15b46317482137990d3df499df0a8d3ed14183ea5f2 +SHA512 (dune-3.9.1.tar.gz) = c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b From 3631ce9297008053e16f09d21ab0b157a9e24847 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 21:50:40 +0100 Subject: [PATCH 09/58] OCaml 5.0 rebuild for Fedora 39 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 7f580ac..d93acc4 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -564,6 +564,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Jul 11 2023 Richard W.M. Jones - 3.9.1-2 +- OCaml 5.0 rebuild for Fedora 39 + * Mon Jul 10 2023 Jerry James - 3.9.1-1 - Version 3.9.1 From 0e8d9a2ae7cfb32428e66d8c2ee65427867575ac Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 11 Jul 2023 22:25:58 +0100 Subject: [PATCH 10/58] ExcludeArch i686 --- ocaml-dune.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index d93acc4..eafccda 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -41,6 +41,9 @@ Patch0: %{name}-no-lwt.patch # See https://github.com/ocaml/dune/issues/6929 Patch1: %{name}-debuginfo.patch +# OCaml packages not built on i686 since OCaml 5 / Fedora 39. +ExcludeArch: %{ix86} + BuildRequires: emacs-nox BuildRequires: make BuildRequires: ocaml >= 4.08 @@ -564,8 +567,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog -* Tue Jul 11 2023 Richard W.M. Jones - 3.9.1-2 +* Tue Jul 11 2023 Richard W.M. Jones - 3.9.1-3 - OCaml 5.0 rebuild for Fedora 39 +- ExcludeArch i686 * Mon Jul 10 2023 Jerry James - 3.9.1-1 - Version 3.9.1 From 84eda40037426542d4c5ed4654ed0b537a95c8a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:16:23 +0000 Subject: [PATCH 11/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index eafccda..7ba620a 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -567,6 +567,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 3.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Richard W.M. Jones - 3.9.1-3 - OCaml 5.0 rebuild for Fedora 39 - ExcludeArch i686 From 63aa62e5c363e157663f377e1a157e7149cd866f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 26 Jul 2023 10:42:39 -0600 Subject: [PATCH 12/58] Version 3.9.2 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 7ba620a..c5183bf 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,8 +8,8 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.9.1 -Release: 4%{?dist} +Version: 3.9.2 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -567,6 +567,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Jul 26 2023 Jerry James - 3.9.2-1 +- Version 3.9.2 + * Thu Jul 20 2023 Fedora Release Engineering - 3.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index fd3bca4..a42d8c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.9.1.tar.gz) = c997ec2205fa5391acbca9e196387cec1af69d3aed4cebe21d82edbe66bd91fda0c742e7ff2e3ffb8df88e2e379bbff68028574664cf375d04f4d3f3f2102f3b +SHA512 (dune-3.9.2.tar.gz) = 72013edec55b258436f640159f10070ba4d69368e45b909c227583b753f8c41d84b714542cbc622391d51f29cdb97d1685edb1594b83f0d754ed6ac0ea8ab99d From 7297f1f8dd42e6ec504da010081cca2d9f65db15 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 1 Aug 2023 09:09:34 -0600 Subject: [PATCH 13/58] Version 3.10.0 --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index c5183bf..2e4db3c 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,7 +8,7 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.9.2 +Version: 3.10.0 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -567,6 +567,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Aug 1 2023 Jerry James - 3.10.0-1 +- Version 3.10.0 + * Wed Jul 26 2023 Jerry James - 3.9.2-1 - Version 3.9.2 diff --git a/sources b/sources index a42d8c7..245e956 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.9.2.tar.gz) = 72013edec55b258436f640159f10070ba4d69368e45b909c227583b753f8c41d84b714542cbc622391d51f29cdb97d1685edb1594b83f0d754ed6ac0ea8ab99d +SHA512 (dune-3.10.0.tar.gz) = 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de From a5fccffcbaa5040c355f4afdf68869685cbfc1b8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 4 Oct 2023 21:10:09 -0600 Subject: [PATCH 14/58] Version 3.11.0 --- ocaml-dune-debuginfo.patch | 12 ++++++------ ocaml-dune.spec | 21 +++++++++++++++------ sources | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ocaml-dune-debuginfo.patch b/ocaml-dune-debuginfo.patch index 8cb3cb3..8917c71 100644 --- a/ocaml-dune-debuginfo.patch +++ b/ocaml-dune-debuginfo.patch @@ -1,9 +1,9 @@ ---- dune-3.8.1/src/dune_rules/dune_project.ml.orig 2023-06-05 10:33:12.000000000 -0600 -+++ dune-3.8.1/src/dune_rules/dune_project.ml 2023-06-09 15:43:53.671558827 -0600 -@@ -465,7 +465,7 @@ let implicit_transitive_deps_default ~la - let wrapped_executables_default ~(lang : Lang.Instance.t) = - lang.version >= (2, 0) - +--- 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" + 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) -let map_workspace_root_default ~(lang : Lang.Instance.t) = lang.version >= (3, 0) +let map_workspace_root_default ~(lang : Lang.Instance.t) = false diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 2e4db3c..a251de0 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,7 +8,7 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.10.0 +Version: 3.11.0 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -31,6 +31,8 @@ Summary: Composable build system for OCaml and Reason # - vendor/0install-solver # MIT: # - vendor/build_path_prefix_map +# - vendor/fiber +# - vendor/lwd # - vendor/spawn License: MIT AND ISC AND LGPL-2.0-only AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception AND LGPL-2.1-or-later URL: https://dune.build @@ -47,8 +49,10 @@ ExcludeArch: %{ix86} BuildRequires: emacs-nox BuildRequires: make BuildRequires: ocaml >= 4.08 +BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-csexp-devel >= 1.5.0 BuildRequires: ocaml-pp-devel >= 1.1.0 +BuildRequires: ocaml-rpm-macros BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-copybutton} BuildRequires: %{py3_dist sphinx-rtd-theme} @@ -63,11 +67,13 @@ BuildRequires: ocaml-lwt-devel Provides: bundled(ocaml-0install-solver) = 2.18 Provides: bundled(ocaml-build-path-prefix-map) = 0.3 Provides: bundled(ocaml-cmdliner) = 1.1.1 +Provides: bundled(ocaml-fiber) = 3.7.0 Provides: bundled(ocaml-fmt) = 0.8.10 Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 Provides: bundled(ocaml-inotify) = 2.3 +Provides: bundled(ocaml-lwd) = 0.3 Provides: bundled(ocaml-notty) = 0.2.3 -Provides: bundled(ocaml-opam) = 2.1.4 +Provides: bundled(ocaml-opam) = 2.1.5 Provides: bundled(ocaml-opam-0install) = 0.4.3 Provides: bundled(ocaml-opam-file-format) = 2.1.6 Provides: bundled(ocaml-re) = 1.9.0 @@ -78,7 +84,10 @@ Provides: bundled(ocaml-uutf) = 1.0.3 Provides: dune = %{version}-%{release} # This is needed for the dune-related RPM macros -Requires: python3 +Requires: ocaml-rpm-macros + +# The dune rules module requires Toploop +Requires: ocaml-compiler-libs%{?_isa} # Both packages install a binary named dune and an associated man page Conflicts: wdune @@ -92,9 +101,6 @@ Provides: ocaml-fiber-devel = %{version}-%{release} # Install documentation in the main package doc directory %global _docdir_fmt %{name} -# Do not require ocaml-compiler-libs at runtime -%global __ocaml_requires_opts -i Asttypes -i Build_path_prefix_map -i Cmi_format -i Env -i Ident -i Identifiable -i Load_path -i Location -i Longident -i Misc -i Outcometree -i Parsetree -i Path -i Primitive -i Shape -i Subst -i Topdirs -i Toploop -i Type_immediacy -i Types -i Warnings - %description Dune is a build system designed for OCaml/Reason projects only. It focuses on providing the user with a consistent experience and takes care of most of @@ -567,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Oct 4 2023 Jerry James - 3.11.0-1 +- Version 3.11.0 + * Tue Aug 1 2023 Jerry James - 3.10.0-1 - Version 3.10.0 diff --git a/sources b/sources index 245e956..cb70797 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.10.0.tar.gz) = 2884a4eaaa44164ce911286ca6670b548a4a564e2b5040f05405d1d2729af84083fbfdde7c92db4f6f7a54d15a43fc9dddcec19d8d79d5a66221b2be861473de +SHA512 (dune-3.11.0.tar.gz) = e8bb95d53acb7f5fbd0a144fb2a9350e9280dc0306cdf309b4ad0093821a665b9a231417783210315edcf8e0097b4a0d3b7b10ce3fc04d3183337f463233d755 From 3555f12da55f711b1b6c0048f85f016488bcd29c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 12:18:59 +0100 Subject: [PATCH 15/58] OCaml 5.1 rebuild for Fedora 40 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index a251de0..07bf352 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 3.11.0-2 +- OCaml 5.1 rebuild for Fedora 40 + * Wed Oct 4 2023 Jerry James - 3.11.0-1 - Version 3.11.0 From 5515cdc0e92f08bf6526cc32dfecea1a3f2a40d6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 5 Oct 2023 12:32:47 +0100 Subject: [PATCH 16/58] Bump release and rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 07bf352..ecdcff6 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Oct 05 2023 Richard W.M. Jones - 3.11.0-3 +- Bump release and rebuild + * Thu Oct 05 2023 Richard W.M. Jones - 3.11.0-2 - OCaml 5.1 rebuild for Fedora 40 From b6e079d202a413a2fc1705e6489bc50febd79d7e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Oct 2023 21:02:58 -0600 Subject: [PATCH 17/58] Version 3.11.1 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index ecdcff6..c8a871a 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,8 +8,8 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.11.0 -Release: 3%{?dist} +Version: 3.11.1 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Mon Oct 9 2023 Jerry James - 3.11.1-1 +- Version 3.11.1 + * Thu Oct 05 2023 Richard W.M. Jones - 3.11.0-3 - Bump release and rebuild diff --git a/sources b/sources index cb70797..57f77f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.11.0.tar.gz) = e8bb95d53acb7f5fbd0a144fb2a9350e9280dc0306cdf309b4ad0093821a665b9a231417783210315edcf8e0097b4a0d3b7b10ce3fc04d3183337f463233d755 +SHA512 (dune-3.11.1.tar.gz) = 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4 From 880cc573d3ca51ff95a7a002ca07fe5a48f91e6f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 30 Nov 2023 10:40:39 -0700 Subject: [PATCH 18/58] Version 3.12.1 --- ocaml-dune.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index c8a871a..8d8a173 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,7 +8,7 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.11.1 +Version: 3.12.1 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -66,14 +66,14 @@ BuildRequires: ocaml-lwt-devel # See https://github.com/ocaml/dune/issues/220 Provides: bundled(ocaml-0install-solver) = 2.18 Provides: bundled(ocaml-build-path-prefix-map) = 0.3 -Provides: bundled(ocaml-cmdliner) = 1.1.1 +Provides: bundled(ocaml-cmdliner) = 1.2.0 Provides: bundled(ocaml-fiber) = 3.7.0 Provides: bundled(ocaml-fmt) = 0.8.10 Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 Provides: bundled(ocaml-inotify) = 2.3 Provides: bundled(ocaml-lwd) = 0.3 Provides: bundled(ocaml-notty) = 0.2.3 -Provides: bundled(ocaml-opam) = 2.1.5 +Provides: bundled(ocaml-opam) = 2.2.0~alpha2 Provides: bundled(ocaml-opam-0install) = 0.4.3 Provides: bundled(ocaml-opam-file-format) = 2.1.6 Provides: bundled(ocaml-re) = 1.9.0 @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Nov 30 2023 Jerry James - 3.12.1-1 +- Version 3.12.1 + * Mon Oct 9 2023 Jerry James - 3.11.1-1 - Version 3.11.1 diff --git a/sources b/sources index 57f77f7..0fa3417 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.11.1.tar.gz) = 8d2eef71ae04a95b1d69784311726cafc3b275e1f202851eb116d6e7740015ce2453ec00278ef3b28c0b1544b10dbff36d942b063d7bb0ebc0a03a9a5f8261d4 +SHA512 (dune-3.12.1.tar.gz) = d600d88d7e187938dd78f8053155203856d7dee0b98fe254a3f16e083ed0bf080e6ecb1aae7e31a3f9ebefa06dfd26dc89a5f24c9570bbe61cbd793a4b1ba354 From 89b356be90e0789731b399a30ceeba8c6cb92ff0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 12 Dec 2023 08:47:57 +0000 Subject: [PATCH 19/58] OCaml 5.1.1 rebuild for Fedora 40 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 8d8a173..3287cc6 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Dec 12 2023 Richard W.M. Jones - 3.12.1-2 +- OCaml 5.1.1 rebuild for Fedora 40 + * Thu Nov 30 2023 Jerry James - 3.12.1-1 - Version 3.12.1 From 594b95bea5d6cd51827e522c59eb5c93ea8e310a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 18 Dec 2023 13:27:19 +0000 Subject: [PATCH 20/58] OCaml 5.1.1 + s390x code gen fix for Fedora 40 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 3287cc6..1d40e83 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Mon Dec 18 2023 Richard W.M. Jones - 3.12.1-3 +- OCaml 5.1.1 + s390x code gen fix for Fedora 40 + * Tue Dec 12 2023 Richard W.M. Jones - 3.12.1-2 - OCaml 5.1.1 rebuild for Fedora 40 From 326a9c68d2cc691d85f6c42dcae4006fa1fd74cc Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 9 Jan 2024 09:29:47 -0700 Subject: [PATCH 21/58] Version 3.12.2 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 1d40e83..1ac95ed 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,8 +8,8 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.12.1 -Release: 3%{?dist} +Version: 3.12.2 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Jan 9 2024 Jerry James - 3.12.2-1 +- Version 3.12.2 + * Mon Dec 18 2023 Richard W.M. Jones - 3.12.1-3 - OCaml 5.1.1 + s390x code gen fix for Fedora 40 diff --git a/sources b/sources index 0fa3417..797c170 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.12.1.tar.gz) = d600d88d7e187938dd78f8053155203856d7dee0b98fe254a3f16e083ed0bf080e6ecb1aae7e31a3f9ebefa06dfd26dc89a5f24c9570bbe61cbd793a4b1ba354 +SHA512 (dune-3.12.2.tar.gz) = a1b1ed2bbf41dec568881a71d47dc52c3d0f86d743390f2b7fdfdada219a9ea0866796b8687ca174ab320cc4c579003848699affe1a9502519e0be5abe117412 From 77a25cee8cf62a3db1a9e239c76b7c96934921db Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 20 Jan 2024 11:09:21 -0700 Subject: [PATCH 22/58] Version 3.13.0 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 1ac95ed..7511386 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,7 +8,7 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.12.2 +Version: 3.13.0 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -51,7 +51,7 @@ BuildRequires: make BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-csexp-devel >= 1.5.0 -BuildRequires: ocaml-pp-devel >= 1.1.0 +BuildRequires: ocaml-pp-devel >= 1.2.0 BuildRequires: ocaml-rpm-macros BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-copybutton} @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Sat Jan 20 2024 Jerry James - 3.13.0-1 +- Version 3.13.0 + * Tue Jan 9 2024 Jerry James - 3.12.2-1 - Version 3.12.2 diff --git a/sources b/sources index 797c170..548ea83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.12.2.tar.gz) = a1b1ed2bbf41dec568881a71d47dc52c3d0f86d743390f2b7fdfdada219a9ea0866796b8687ca174ab320cc4c579003848699affe1a9502519e0be5abe117412 +SHA512 (dune-3.13.0.tar.gz) = 667f8877e2debc67cac802ac6a52fec234bfba19e6ad503e39e5739cdaee55f8f5b511bec124c374d9c2b53f8f7a07610085152dbe0f8d1545cc49f7b9d78d25 From b25a690073cf193b92e22799c5014da7b146ac7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 09:57:31 +0000 Subject: [PATCH 23/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 7511386..60b43df 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 3.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Jerry James - 3.13.0-1 - Version 3.13.0 From c42fdafe27788175cc3ee8d834626e4b7ba7b4f0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 2 Feb 2024 08:31:41 -0700 Subject: [PATCH 24/58] Rebuild for changed ocamlx(Dynlink) hash --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 60b43df..0013965 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -9,7 +9,7 @@ Name: ocaml-dune Version: 3.13.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri Feb 2 2024 Jerry James - 3.13.0-3 +- Rebuild for changed ocamlx(Dynlink) hash + * Thu Jan 25 2024 Fedora Release Engineering - 3.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7835ceec6d108a208b71fefb1472c7c99c1637a4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 6 Feb 2024 08:10:31 -0700 Subject: [PATCH 25/58] Version 3.13.1 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 0013965..3757389 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,8 +8,8 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.13.0 -Release: 3%{?dist} +Version: 3.13.1 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Feb 6 2024 Jerry James - 3.13.1-1 +- Version 3.13.1 + * Fri Feb 2 2024 Jerry James - 3.13.0-3 - Rebuild for changed ocamlx(Dynlink) hash diff --git a/sources b/sources index 548ea83..b65b2e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.13.0.tar.gz) = 667f8877e2debc67cac802ac6a52fec234bfba19e6ad503e39e5739cdaee55f8f5b511bec124c374d9c2b53f8f7a07610085152dbe0f8d1545cc49f7b9d78d25 +SHA512 (dune-3.13.1.tar.gz) = 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5 From 2b749b0551e901fdad4ceec99030185fe7ab0d5f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 14 Feb 2024 09:02:25 -0700 Subject: [PATCH 26/58] Version 3.14.0 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 3757389..e7d67ec 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -8,7 +8,7 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.13.1 +Version: 3.14.0 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -76,7 +76,7 @@ Provides: bundled(ocaml-notty) = 0.2.3 Provides: bundled(ocaml-opam) = 2.2.0~alpha2 Provides: bundled(ocaml-opam-0install) = 0.4.3 Provides: bundled(ocaml-opam-file-format) = 2.1.6 -Provides: bundled(ocaml-re) = 1.9.0 +Provides: bundled(ocaml-re) = 1.11.0 Provides: bundled(ocaml-sha) = 1.15.4 Provides: bundled(ocaml-spawn) = 0.15.1 Provides: bundled(ocaml-uutf) = 1.0.3 @@ -573,6 +573,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Feb 14 2024 Jerry James - 3.14.0-1 +- Version 3.14.0 + * Tue Feb 6 2024 Jerry James - 3.13.1-1 - Version 3.13.1 diff --git a/sources b/sources index b65b2e3..80fb359 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.13.1.tar.gz) = 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5 +SHA512 (dune-3.14.0.tar.gz) = 906539a3a77494efdee59393e91ec555e3a0e83c7ab20795e11d792c6d57f4eed01e3f565cd578d4751cc3fd858ce58732e936bbdca05808e412a3fa70680fa7 From 30e1a15ea4a3c9fe6dd95e817692f381ce7c9bb7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 14 Mar 2024 08:53:27 -0600 Subject: [PATCH 27/58] Version 3.14.2 --- ocaml-dune.spec | 14 +++++++++----- sources | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index e7d67ec..ad64750 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,10 +5,10 @@ # One of the dune libraries now depends on lwt. We do not currently need that # library in Fedora, so don't build it. -%bcond_with lwt +%bcond lwt 0 Name: ocaml-dune -Version: 3.14.0 +Version: 3.14.2 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -36,7 +36,8 @@ Summary: Composable build system for OCaml and Reason # - vendor/spawn License: MIT AND ISC AND LGPL-2.0-only AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception AND LGPL-2.1-or-later URL: https://dune.build -Source0: https://github.com/ocaml/dune/archive/%{version}/dune-%{version}.tar.gz +VCS: https://github.com/ocaml/dune +Source0: %{vcs}/archive/%{version}/dune-%{version}.tar.gz # When building without lwt, remove libraries that need it Patch0: %{name}-no-lwt.patch # Temporary workaround for broken debuginfo (rhbz#2168932) @@ -44,9 +45,9 @@ Patch0: %{name}-no-lwt.patch Patch1: %{name}-debuginfo.patch # OCaml packages not built on i686 since OCaml 5 / Fedora 39. -ExcludeArch: %{ix86} +ExcludeArch: %{ix86} -BuildRequires: emacs-nox +BuildRequires: emacs-nw BuildRequires: make BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-compiler-libs @@ -573,6 +574,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Mar 14 2024 Jerry James - 3.14.2-1 +- Version 3.14.2 + * Wed Feb 14 2024 Jerry James - 3.14.0-1 - Version 3.14.0 diff --git a/sources b/sources index 80fb359..139c04a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.14.0.tar.gz) = 906539a3a77494efdee59393e91ec555e3a0e83c7ab20795e11d792c6d57f4eed01e3f565cd578d4751cc3fd858ce58732e936bbdca05808e412a3fa70680fa7 +SHA512 (dune-3.14.2.tar.gz) = 33079fce72a86e6d4c0d33686b17c7056bd361959d3873f8bb5fc3d1993341c4645b2f389944a2e0a071243a7f22936bdcb28261dae79b517cf14aa230af448c From 954cd5a48a5a866cfe98540d154ab29402c32d22 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 5 Apr 2024 09:28:31 -0600 Subject: [PATCH 28/58] Version 3.15.0 --- ocaml-dune-no-lwt.patch | 13 ++++++------- ocaml-dune.spec | 23 ++++++++++++++--------- sources | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) 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 From 16fed01b22bf023abd6fc2e710de64e7800db21c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 8 Apr 2024 13:34:36 -0400 Subject: [PATCH 29/58] Disable docs in RHEL builds ocaml-dune is the only consumer of sphinx-copybutton in RHEL/ELN, and the recent addition of sphinx-design pulls in many unwanted Python build dependencies. --- ocaml-dune.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index f8128c6..8632ee6 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -7,9 +7,12 @@ # library in Fedora, so don't build it. %bcond lwt 0 +# docs are not needed in RHEL, and add unwanted build dependencies +%bcond docs %{undefined rhel} + Name: ocaml-dune Version: 3.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -54,10 +57,13 @@ BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-csexp-devel >= 1.5.0 BuildRequires: ocaml-pp-devel >= 1.2.0 BuildRequires: ocaml-rpm-macros + +%if %{with docs} BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-copybutton} BuildRequires: %{py3_dist sphinx-design} BuildRequires: %{py3_dist sphinx-rtd-theme} +%endif %if %{with lwt} BuildRequires: ocaml-lwt-devel >= 5.6.0 @@ -114,6 +120,7 @@ adapted to the open source world. It has matured over a long time and is used daily by hundred of developers, which means that it is highly tested and productive. +%if %{with docs} %package doc # The content is MIT. Other licenses are due to files added by sphinx. # BSD-2-Clause: @@ -143,6 +150,7 @@ BuildArch: noarch %description doc HTML documentation for dune, a composable build system for OCaml. +%endif %package emacs Summary: Emacs support for %{name} @@ -477,7 +485,9 @@ sed -i 's/, < 6//'g doc/requirements.txt --sbindir %{_sbindir} %make_build release +%if %{with docs} %make_build doc +%endif # We also want the libraries # Do not use the bundled csexp and pp when building them @@ -507,8 +517,10 @@ cd - %{_bindir}/dune %{_mandir}/man*/dune* +%if %{with docs} %files doc %doc doc/_build/* +%endif %files emacs %{_emacs_sitelispdir}/dune* @@ -576,6 +588,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Mon Apr 08 2024 Yaakov Selkowitz - 3.15.0-2 +- Disable docs in RHEL builds + * Fri Apr 5 2024 Jerry James - 3.15.0-1 - Version 3.15.0 From f0c1c80838253e14921ecddeeb31951317c0f64f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 18 Apr 2024 08:55:01 -0600 Subject: [PATCH 30/58] Version 3.15.1 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 8632ee6..2f1cc9f 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,8 +11,8 @@ %bcond docs %{undefined rhel} Name: ocaml-dune -Version: 3.15.0 -Release: 2%{?dist} +Version: 3.15.1 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -588,6 +588,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Apr 18 2024 Jerry James - 3.15.1-1 +- Version 3.15.1 + * Mon Apr 08 2024 Yaakov Selkowitz - 3.15.0-2 - Disable docs in RHEL builds diff --git a/sources b/sources index 7d5b68c..d8a6216 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.15.0.tar.gz) = 1a48e70157ecf697ab490d05863cd8936978d7aac71e3cf16b3bd1c0de37442c65261df0906d2daba75ad66f1b7463af26f00c7c4fb7c17a6505375505b21d13 +SHA512 (dune-3.15.1.tar.gz) = 708ca3d487ee845b0e3c464fd5c0ac9b6fcc0d952b5d937a99944a9ae9ca2f037a3520e9f360d50eee925d5853a1f205caee1297920803e3a259dda87c7ebe2c From 58c31cc982c62c69ad99d43ad8c9aafa272f0bae Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 24 Apr 2024 09:38:58 -0600 Subject: [PATCH 31/58] Version 3.15.2 --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 2f1cc9f..b30b7ad 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,7 +11,7 @@ %bcond docs %{undefined rhel} Name: ocaml-dune -Version: 3.15.1 +Version: 3.15.2 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -588,6 +588,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Apr 24 2024 Jerry James - 3.15.2-1 +- Version 3.15.2 + * Thu Apr 18 2024 Jerry James - 3.15.1-1 - Version 3.15.1 diff --git a/sources b/sources index d8a6216..c1219ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.15.1.tar.gz) = 708ca3d487ee845b0e3c464fd5c0ac9b6fcc0d952b5d937a99944a9ae9ca2f037a3520e9f360d50eee925d5853a1f205caee1297920803e3a259dda87c7ebe2c +SHA512 (dune-3.15.2.tar.gz) = a15658e439984e0256aedd67b5107d8a347c73752566e8e76f5cf5ef807c3761747f5443bd042d0434a26f73ab18ab283eaf705f797ca31737b45530251210e6 From 7da3dbf4888b91895972b264cfd953e6330f6326 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 15 May 2024 20:26:31 +0100 Subject: [PATCH 32/58] Use bundled ocaml-csexp and ocaml-pp (RHEL only) *On RHEL only* the aim is to minimize source packages. Use the bundled ocaml-csexp and ocaml-pp and remove those as build dependencies. They are still listed as Requires by some binary packages that we don't actually use in RHEL. --- ocaml-dune.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index b30b7ad..153f48d 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -12,7 +12,7 @@ Name: ocaml-dune Version: 3.15.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -54,8 +54,10 @@ BuildRequires: emacs-nw BuildRequires: make BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-compiler-libs +%if !0%{?rhel} BuildRequires: ocaml-csexp-devel >= 1.5.0 BuildRequires: ocaml-pp-devel >= 1.2.0 +%endif BuildRequires: ocaml-rpm-macros %if %{with docs} @@ -490,8 +492,10 @@ sed -i 's/, < 6//'g doc/requirements.txt %endif # We also want the libraries +%if !0%{?rhel} # Do not use the bundled csexp and pp when building them rm -fr vendor/{csexp,pp} +%endif ./dune.exe build %{?_smp_mflags} --verbose --release @install %install @@ -588,6 +592,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed May 15 2024 Richard W.M. Jones - 3.15.2-2 +- Use bundled ocaml-csexp and ocaml-pp (RHEL only) + * Wed Apr 24 2024 Jerry James - 3.15.2-1 - Version 3.15.2 From 5923869db8d8a96e10de2d35502e5f55ca618697 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 27 May 2024 07:54:51 -0600 Subject: [PATCH 33/58] Version 3.15.3 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 153f48d..dbdf50e 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,8 +11,8 @@ %bcond docs %{undefined rhel} Name: ocaml-dune -Version: 3.15.2 -Release: 2%{?dist} +Version: 3.15.3 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -592,6 +592,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Mon May 27 2024 Jerry James - 3.15.3-1 +- Version 3.15.3 + * Wed May 15 2024 Richard W.M. Jones - 3.15.2-2 - Use bundled ocaml-csexp and ocaml-pp (RHEL only) diff --git a/sources b/sources index c1219ab..d0e231a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.15.2.tar.gz) = a15658e439984e0256aedd67b5107d8a347c73752566e8e76f5cf5ef807c3761747f5443bd042d0434a26f73ab18ab283eaf705f797ca31737b45530251210e6 +SHA512 (dune-3.15.3.tar.gz) = 4cdfc7667b4e232077fa24ed9a499bfb015df3e1085c4e5de8d50434bd068adcd8e70fa831f43e3e9534bfe2380b67bb53fdacca5befdd01b899be9cb14350e6 From cb1ce5ff91978c9e3e8cbd24a1d3f013d337ac86 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 29 May 2024 17:33:35 +0100 Subject: [PATCH 34/58] OCaml 5.2.0 for Fedora 41 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index dbdf50e..11d8ca1 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -12,7 +12,7 @@ Name: ocaml-dune Version: 3.15.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -592,6 +592,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed May 29 2024 Richard W.M. Jones - 3.15.3-2 +- OCaml 5.2.0 for Fedora 41 + * Mon May 27 2024 Jerry James - 3.15.3-1 - Version 3.15.3 From 6a01d90761a2ab493355aca2209bc1def4b4d607 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 17 Jun 2024 09:21:27 -0600 Subject: [PATCH 35/58] Version 3.16.0 --- ocaml-dune.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 11d8ca1..7138341 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,8 +11,8 @@ %bcond docs %{undefined rhel} Name: ocaml-dune -Version: 3.15.3 -Release: 2%{?dist} +Version: 3.16.0 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -592,6 +592,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Mon Jun 17 2024 Jerry James - 3.16.0-1 +- Version 3.16.0 + * Wed May 29 2024 Richard W.M. Jones - 3.15.3-2 - OCaml 5.2.0 for Fedora 41 diff --git a/sources b/sources index d0e231a..28d2e29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.15.3.tar.gz) = 4cdfc7667b4e232077fa24ed9a499bfb015df3e1085c4e5de8d50434bd068adcd8e70fa831f43e3e9534bfe2380b67bb53fdacca5befdd01b899be9cb14350e6 +SHA512 (dune-3.16.0.tar.gz) = 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23 From 684f60e3d02948c30145639936453758daf1f84f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 08:18:44 +0100 Subject: [PATCH 36/58] Remove ocaml-csexp and ocaml-pp dependencies (RHEL only) --- ocaml-dune.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 7138341..f6657c8 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -324,7 +324,9 @@ Summary: Development files for %{name}-rpc-lwt License: MIT Requires: %{name}-rpc-lwt%{?_isa} = %{version}-%{release} Requires: %{name}-rpc-devel%{?_isa} = %{version}-%{release} +%if !0%{?rhel} Requires: ocaml-csexp-devel%{?_isa} +%endif Requires: ocaml-lwt-devel%{?_isa} %description rpc-lwt-devel @@ -385,7 +387,9 @@ Summary: Development files for ocaml-dyn License: MIT Requires: ocaml-dyn%{?_isa} = %{version}-%{release} Requires: ocaml-ordering-devel%{?_isa} = %{version}-%{release} +%if !0%{?rhel} Requires: ocaml-pp-devel%{?_isa} +%endif %description -n ocaml-dyn-devel The ocaml-dyn-devel package contains libraries and signature files for @@ -441,7 +445,9 @@ Summary: Development files for ocaml-stdune License: MIT Requires: ocaml-stdune%{?_isa} = %{version}-%{release} Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} +%if !0%{?rhel} Requires: ocaml-csexp-devel%{?_isa} +%endif %description -n ocaml-stdune-devel The ocaml-stdune-devel package contains libraries and signature files From 3a29ce3a6d05e0699c10b53c6e8660cf0be67758 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 09:19:03 +0100 Subject: [PATCH 37/58] Add RHEL gating test --- gating.yaml | 6 ++++++ tests/basic-test.sh | 6 ++++++ tests/tests.yml | 12 ++++++++++++ 3 files changed, 24 insertions(+) create mode 100755 gating.yaml create mode 100755 tests/basic-test.sh create mode 100755 tests/tests.yml diff --git a/gating.yaml b/gating.yaml new file mode 100755 index 0000000..2c7ed80 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,6 @@ +--- !Policy +product_versions: + - rhel-* +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/tests/basic-test.sh b/tests/basic-test.sh new file mode 100755 index 0000000..a15afdf --- /dev/null +++ b/tests/basic-test.sh @@ -0,0 +1,6 @@ +#!/bin/bash - +set -e +set -x + +# Just check that dune works. +dune --version diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100755 index 0000000..6d126cf --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,12 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - ocaml + - ocaml-dune + tests: + - simple: + dir: . + run: ./basic-test.sh From a5e7a8cbbeae47476814fa1497643b16dcb07235 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 19 Jun 2024 13:22:33 +0100 Subject: [PATCH 38/58] OCaml 5.2.0 ppc64le fix --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index f6657c8..76ae405 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -12,7 +12,7 @@ Name: ocaml-dune Version: 3.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -598,6 +598,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Jun 19 2024 Richard W.M. Jones - 3.16.0-2 +- OCaml 5.2.0 ppc64le fix + * Mon Jun 17 2024 Jerry James - 3.16.0-1 - Version 3.16.0 From cfc02b42caace5edef1ce08e6d756672bf5966e4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 10:21:26 -0600 Subject: [PATCH 39/58] Fix the VCS field - Drop Conflicts with retired package wdune - Minor spec file simplifications --- ocaml-dune.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 76ae405..c21c3f0 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -10,6 +10,8 @@ # docs are not needed in RHEL, and add unwanted build dependencies %bcond docs %{undefined rhel} +%global giturl https://github.com/ocaml/dune + Name: ocaml-dune Version: 3.16.0 Release: 2%{?dist} @@ -39,13 +41,13 @@ Summary: Composable build system for OCaml and Reason # - vendor/spawn License: MIT AND ISC AND LGPL-2.0-only AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception AND LGPL-2.1-or-later URL: https://dune.build -VCS: https://github.com/ocaml/dune -Source0: %{vcs}/archive/%{version}/dune-%{version}.tar.gz +VCS: git:%{giturl}.git +Source: %{giturl}/archive/%{version}/dune-%{version}.tar.gz # When building without lwt, remove libraries that need it -Patch0: %{name}-no-lwt.patch +Patch: %{name}-no-lwt.patch # Temporary workaround for broken debuginfo (rhbz#2168932) # See https://github.com/ocaml/dune/issues/6929 -Patch1: %{name}-debuginfo.patch +Patch: %{name}-debuginfo.patch # OCaml packages not built on i686 since OCaml 5 / Fedora 39. ExcludeArch: %{ix86} @@ -99,9 +101,6 @@ Requires: ocaml-rpm-macros # The dune rules module requires Toploop Requires: ocaml-compiler-libs%{?_isa} -# Both packages install a binary named dune and an associated man page -Conflicts: wdune - # This can be removed when F42 reaches EOL Obsoletes: ocaml-fiber < 3.7.0 Obsoletes: ocaml-fiber-devel < 3.7.0 From 0f09d23f5850f36dda8b5f390e95b486dccc60d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:05:48 +0000 Subject: [PATCH 40/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index c21c3f0..e7f237c 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -14,7 +14,7 @@ Name: ocaml-dune Version: 3.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -597,6 +597,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 3.16.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Richard W.M. Jones - 3.16.0-2 - OCaml 5.2.0 ppc64le fix From 7eb99c9abe8bf56bcfc2577dcf5876429ba00694 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 8 Oct 2024 09:44:33 +0100 Subject: [PATCH 41/58] Rebuild for ocaml-lwt 5.8.0 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index e7f237c..a4f0738 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -14,7 +14,7 @@ Name: ocaml-dune Version: 3.16.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -597,6 +597,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Oct 08 2024 Richard W.M. Jones - 3.16.0-4 +- Rebuild for ocaml-lwt 5.8.0 + * Thu Jul 18 2024 Fedora Release Engineering - 3.16.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e8b7e3898e503583b30a2ab0235f06260b507575 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Fri, 11 Oct 2024 00:04:37 +0200 Subject: [PATCH 42/58] Use the furo theme for docs build --- ocaml-dune.spec | 14 +++-- use-furo-theme.patch | 141 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 5 deletions(-) create mode 100644 use-furo-theme.patch diff --git a/ocaml-dune.spec b/ocaml-dune.spec index a4f0738..e45496f 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -14,7 +14,7 @@ Name: ocaml-dune Version: 3.16.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -49,6 +49,10 @@ Patch: %{name}-no-lwt.patch # See https://github.com/ocaml/dune/issues/6929 Patch: %{name}-debuginfo.patch +# Change to the furo theme for the docs +# https://github.com/ocaml/dune/commit/9f3da04c1c27ff80e8d1ab71de15c53a0ca953da +Patch: use-furo-theme.patch + # OCaml packages not built on i686 since OCaml 5 / Fedora 39. ExcludeArch: %{ix86} @@ -66,7 +70,7 @@ BuildRequires: ocaml-rpm-macros BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-copybutton} BuildRequires: %{py3_dist sphinx-design} -BuildRequires: %{py3_dist sphinx-rtd-theme} +BuildRequires: %{py3_dist furo} %endif %if %{with lwt} @@ -477,9 +481,6 @@ rm -fr otherlibs/dune-rpc-lwt dune-rpc-lwt.opam %endif %autopatch -m1 -p1 -# Allow use of Sphinx 6 -sed -i 's/, < 6//'g doc/requirements.txt - %build ./configure \ --bindir %{_bindir} \ @@ -597,6 +598,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Oct 10 2024 Charalampos Stratakis - 3.16.0-5 +- Use the furo theme for docs build + * Tue Oct 08 2024 Richard W.M. Jones - 3.16.0-4 - Rebuild for ocaml-lwt 5.8.0 diff --git a/use-furo-theme.patch b/use-furo-theme.patch new file mode 100644 index 0000000..d39f919 --- /dev/null +++ b/use-furo-theme.patch @@ -0,0 +1,141 @@ +From ef461f6000ffbf2f7381e3b8d1d9c7ecdd518b20 Mon Sep 17 00:00:00 2001 +From: Etienne Millon +Date: Fri, 2 Aug 2024 10:28:46 +0200 +Subject: [PATCH] docs: use furo theme (#10786) + +* docs: use furo theme + +This theme has several advantages compared to `sphinx_rtd_theme`: + +- support for light and dark mode +- a sidebar on the right with a table of contents for the current + documentation +- better use of horizontal space (half of the screen is unused with + `sphinx_rtd_theme`) +- "it looks better" + +Signed-off-by: Etienne Millon + +* use sphinx >= 6 + +Signed-off-by: Etienne Millon + +--------- + +Signed-off-by: Etienne Millon +--- + doc/conf.py | 12 +++--------- + doc/coq.rst | 3 --- + doc/hacking.rst | 5 ----- + doc/requirements.txt | 4 ++-- + flake.nix | 4 ++-- + 5 files changed, 7 insertions(+), 21 deletions(-) + +diff --git a/doc/conf.py b/doc/conf.py +index 787d072..f3bd7ee 100644 +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -74,7 +74,7 @@ language = "en" + exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] + + # The name of the Pygments (syntax highlighting) style to use. +-pygments_style = 'sphinx' ++pygments_style = 'friendly' + + # If true, `todo` and `todoList` produce output, else they produce nothing. + todo_include_todos = False +@@ -85,13 +85,13 @@ todo_include_todos = False + # The theme to use for HTML and HTML Help pages. See the documentation for + # a list of builtin themes. + # +-html_theme = 'sphinx_rtd_theme' ++html_theme = 'furo' + + # Theme options are theme-specific and customize the look and feel of a theme + # further. For a list of options available for each theme, see the + # documentation. + # +-html_theme_options = {'navigation_depth': 6} ++html_theme_options = {} + + # Add any paths that contain custom static files (such as style sheets) here, + # relative to this directory. They are copied after the builtin static files, +@@ -155,12 +155,6 @@ texinfo_documents = [ + 'Miscellaneous'), + ] + +- +- +-import sphinx_rtd_theme +- +-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] +- + html_context = { + 'display_github': True, + 'github_user': 'ocaml', +diff --git a/doc/coq.rst b/doc/coq.rst +index 2266cc4..d20a4da 100644 +--- a/doc/coq.rst ++++ b/doc/coq.rst +@@ -11,9 +11,6 @@ Coq + - reference info for stanzas and variables + - tutorials (the examples part) + +-.. contents:: Table of Contents +- :depth: 3 +- + Introduction + ------------ + +diff --git a/doc/hacking.rst b/doc/hacking.rst +index 096ee5d..6f1ff14 100644 +--- a/doc/hacking.rst ++++ b/doc/hacking.rst +@@ -10,11 +10,6 @@ general guidelines specific to Dune. However, given that Dune is a large project + developed by many different people, it's important to follow these guidelines in + order to keep the project in a good state and pleasant to work on for everybody. + +-.. contents:: Table of Contents +- :depth: 1 +- :local: +- :backlinks: none +- + Dependencies + ============ + +diff --git a/doc/requirements.txt b/doc/requirements.txt +index 21f8f5f..b4a0e74 100644 +--- a/doc/requirements.txt ++++ b/doc/requirements.txt +@@ -1,4 +1,4 @@ +-sphinx >= 4.5.0, < 6 +-sphinx_rtd_theme >= 1.0.0 ++sphinx >= 6 ++furo + sphinx-copybutton >= 0.5.0 + sphinx-design +diff --git a/flake.nix b/flake.nix +index 00f97e1..ca349f2 100644 +--- a/flake.nix ++++ b/flake.nix +@@ -122,7 +122,7 @@ + + docInputs = with pkgs'.python3.pkgs; [ + sphinx-autobuild +- sphinx_rtd_theme ++ furo + sphinx-copybutton + sphinx-design + ]; +@@ -164,7 +164,7 @@ + sphinx + sphinx-autobuild + python310Packages.sphinx-copybutton +- python310Packages.sphinx-rtd-theme ++ python310Packages.furo + python310Packages.sphinx-design + ] + ); +-- +2.46.2 + From 30f268210da7409070ad135bc88ca4545f444dbf Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 31 Oct 2024 14:48:48 -0600 Subject: [PATCH 43/58] Version 3.16.1 --- ocaml-dune.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index e45496f..3650b67 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,8 +13,8 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.16.0 -Release: 5%{?dist} +Version: 3.16.1 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -67,10 +67,10 @@ BuildRequires: ocaml-pp-devel >= 1.2.0 BuildRequires: ocaml-rpm-macros %if %{with docs} +BuildRequires: %{py3_dist furo} BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-copybutton} BuildRequires: %{py3_dist sphinx-design} -BuildRequires: %{py3_dist furo} %endif %if %{with lwt} @@ -598,6 +598,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Oct 31 2024 Jerry James - 3.16.1-1 +- Version 3.16.1 + * Thu Oct 10 2024 Charalampos Stratakis - 3.16.0-5 - Use the furo theme for docs build diff --git a/sources b/sources index 28d2e29..1fc7796 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.16.0.tar.gz) = 3b1d041907128b6598e0f6150fe300a4a69098822f823ceead63b46e1005a21485738c6fa92641dd940c9f9cde48ae141ea51959a9b250bee3cbeb06ba788e23 +SHA512 (dune-3.16.1.tar.gz) = 18e8022c5fa276e06f788cf25a4d6d08e3247c546cd69a5206d4e78ece1f47a615c6d5842e68e1fa7908cae7ae8c6e4f31d2eb835d97b5e6b5e4154957139e9f From 8a80202e949c712f28b27ea989f9d712a6f37e04 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 26 Dec 2024 20:01:26 -0700 Subject: [PATCH 44/58] Version 3.17.1 - Update License field for changes in vendored dependencies - Drop upstreamed furo theme patch --- ocaml-dune.spec | 25 ++++---- sources | 2 +- use-furo-theme.patch | 141 ------------------------------------------- 3 files changed, 12 insertions(+), 156 deletions(-) delete mode 100644 use-furo-theme.patch diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 3650b67..3bcc151 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,7 +13,7 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.16.1 +Version: 3.17.1 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -22,24 +22,21 @@ Summary: Composable build system for OCaml and Reason # - vendor/cmdliner # - vendor/fmt # - vendor/notty -# - vendor/opam-0install # - vendor/sha # - vendor/uutf -# LGPL-2.0-only: +# LGPL-2.1-only: # - vendor/incremental-cycles -# LGPL-2.0-only WITH OCaml-LGPL-linking-exception +# LGPL-2.1-only WITH OCaml-LGPL-linking-exception # - vendor/ocaml-inotify # - vendor/opam # - vendor/opam-file-format # - vendor/re -# LGPL-2.1-or-later: -# - vendor/0install-solver # MIT: # - vendor/build_path_prefix_map # - vendor/fiber # - vendor/lwd # - vendor/spawn -License: MIT AND ISC AND LGPL-2.0-only AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception AND LGPL-2.1-or-later +License: MIT AND ISC AND LGPL-2.1-only AND LGPL-2.1-only WITH OCaml-LGPL-linking-exception URL: https://dune.build VCS: git:%{giturl}.git Source: %{giturl}/archive/%{version}/dune-%{version}.tar.gz @@ -49,10 +46,6 @@ Patch: %{name}-no-lwt.patch # See https://github.com/ocaml/dune/issues/6929 Patch: %{name}-debuginfo.patch -# Change to the furo theme for the docs -# https://github.com/ocaml/dune/commit/9f3da04c1c27ff80e8d1ab71de15c53a0ca953da -Patch: use-furo-theme.patch - # OCaml packages not built on i686 since OCaml 5 / Fedora 39. ExcludeArch: %{ix86} @@ -62,12 +55,13 @@ BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-compiler-libs %if !0%{?rhel} BuildRequires: ocaml-csexp-devel >= 1.5.0 -BuildRequires: ocaml-pp-devel >= 1.2.0 +BuildRequires: ocaml-pp-devel >= 2.0.0 %endif BuildRequires: ocaml-rpm-macros %if %{with docs} BuildRequires: %{py3_dist furo} +BuildRequires: %{py3_dist myst-parser} BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-copybutton} BuildRequires: %{py3_dist sphinx-design} @@ -80,7 +74,6 @@ BuildRequires: ocaml-lwt-devel >= 5.6.0 # Dune has vendored deps to avoid dependency cycles. Upstream deliberately # does not support unbundling these dependencies. # See https://github.com/ocaml/dune/issues/220 -Provides: bundled(ocaml-0install-solver) = 2.18 Provides: bundled(ocaml-build-path-prefix-map) = 0.3 Provides: bundled(ocaml-cmdliner) = 1.2.0 Provides: bundled(ocaml-fiber) = 3.7.0 @@ -90,7 +83,6 @@ 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-0install) = 0.4.3 Provides: bundled(ocaml-opam-file-format) = 2.1.6 Provides: bundled(ocaml-re) = 1.11.0 Provides: bundled(ocaml-sha) = 1.15.4 @@ -598,6 +590,11 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Dec 26 2024 Jerry James - 3.17.1-1 +- Version 3.17.1 +- Update License field for changes in vendored dependencies +- Drop upstreamed furo theme patch + * Thu Oct 31 2024 Jerry James - 3.16.1-1 - Version 3.16.1 diff --git a/sources b/sources index 1fc7796..ba15820 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.16.1.tar.gz) = 18e8022c5fa276e06f788cf25a4d6d08e3247c546cd69a5206d4e78ece1f47a615c6d5842e68e1fa7908cae7ae8c6e4f31d2eb835d97b5e6b5e4154957139e9f +SHA512 (dune-3.17.1.tar.gz) = 2953a7c3cfddfe4ef82cbecafba75883f9ccfd96c5630313c95e49e10398d806b9dcd0385dff593a31752c915e20c1d1a0f5e0a20ad7195eb36f408c2d6b66f7 diff --git a/use-furo-theme.patch b/use-furo-theme.patch deleted file mode 100644 index d39f919..0000000 --- a/use-furo-theme.patch +++ /dev/null @@ -1,141 +0,0 @@ -From ef461f6000ffbf2f7381e3b8d1d9c7ecdd518b20 Mon Sep 17 00:00:00 2001 -From: Etienne Millon -Date: Fri, 2 Aug 2024 10:28:46 +0200 -Subject: [PATCH] docs: use furo theme (#10786) - -* docs: use furo theme - -This theme has several advantages compared to `sphinx_rtd_theme`: - -- support for light and dark mode -- a sidebar on the right with a table of contents for the current - documentation -- better use of horizontal space (half of the screen is unused with - `sphinx_rtd_theme`) -- "it looks better" - -Signed-off-by: Etienne Millon - -* use sphinx >= 6 - -Signed-off-by: Etienne Millon - ---------- - -Signed-off-by: Etienne Millon ---- - doc/conf.py | 12 +++--------- - doc/coq.rst | 3 --- - doc/hacking.rst | 5 ----- - doc/requirements.txt | 4 ++-- - flake.nix | 4 ++-- - 5 files changed, 7 insertions(+), 21 deletions(-) - -diff --git a/doc/conf.py b/doc/conf.py -index 787d072..f3bd7ee 100644 ---- a/doc/conf.py -+++ b/doc/conf.py -@@ -74,7 +74,7 @@ language = "en" - exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] - - # The name of the Pygments (syntax highlighting) style to use. --pygments_style = 'sphinx' -+pygments_style = 'friendly' - - # If true, `todo` and `todoList` produce output, else they produce nothing. - todo_include_todos = False -@@ -85,13 +85,13 @@ todo_include_todos = False - # The theme to use for HTML and HTML Help pages. See the documentation for - # a list of builtin themes. - # --html_theme = 'sphinx_rtd_theme' -+html_theme = 'furo' - - # Theme options are theme-specific and customize the look and feel of a theme - # further. For a list of options available for each theme, see the - # documentation. - # --html_theme_options = {'navigation_depth': 6} -+html_theme_options = {} - - # Add any paths that contain custom static files (such as style sheets) here, - # relative to this directory. They are copied after the builtin static files, -@@ -155,12 +155,6 @@ texinfo_documents = [ - 'Miscellaneous'), - ] - -- -- --import sphinx_rtd_theme -- --html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] -- - html_context = { - 'display_github': True, - 'github_user': 'ocaml', -diff --git a/doc/coq.rst b/doc/coq.rst -index 2266cc4..d20a4da 100644 ---- a/doc/coq.rst -+++ b/doc/coq.rst -@@ -11,9 +11,6 @@ Coq - - reference info for stanzas and variables - - tutorials (the examples part) - --.. contents:: Table of Contents -- :depth: 3 -- - Introduction - ------------ - -diff --git a/doc/hacking.rst b/doc/hacking.rst -index 096ee5d..6f1ff14 100644 ---- a/doc/hacking.rst -+++ b/doc/hacking.rst -@@ -10,11 +10,6 @@ general guidelines specific to Dune. However, given that Dune is a large project - developed by many different people, it's important to follow these guidelines in - order to keep the project in a good state and pleasant to work on for everybody. - --.. contents:: Table of Contents -- :depth: 1 -- :local: -- :backlinks: none -- - Dependencies - ============ - -diff --git a/doc/requirements.txt b/doc/requirements.txt -index 21f8f5f..b4a0e74 100644 ---- a/doc/requirements.txt -+++ b/doc/requirements.txt -@@ -1,4 +1,4 @@ --sphinx >= 4.5.0, < 6 --sphinx_rtd_theme >= 1.0.0 -+sphinx >= 6 -+furo - sphinx-copybutton >= 0.5.0 - sphinx-design -diff --git a/flake.nix b/flake.nix -index 00f97e1..ca349f2 100644 ---- a/flake.nix -+++ b/flake.nix -@@ -122,7 +122,7 @@ - - docInputs = with pkgs'.python3.pkgs; [ - sphinx-autobuild -- sphinx_rtd_theme -+ furo - sphinx-copybutton - sphinx-design - ]; -@@ -164,7 +164,7 @@ - sphinx - sphinx-autobuild - python310Packages.sphinx-copybutton -- python310Packages.sphinx-rtd-theme -+ python310Packages.furo - python310Packages.sphinx-design - ] - ); --- -2.46.2 - From 65b81cbfb7b1e6e52b79dc17071667c6539b3529 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 20:48:17 +0000 Subject: [PATCH 45/58] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 3bcc151..ab8b1c1 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -14,7 +14,7 @@ Name: ocaml-dune Version: 3.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -590,6 +590,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 3.17.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Dec 26 2024 Jerry James - 3.17.1-1 - Version 3.17.1 - Update License field for changes in vendored dependencies From 5e00b46ccbb5e1f937a220bf63992a5ed6d2a61a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 23 Jan 2025 12:11:26 -0700 Subject: [PATCH 46/58] Version 3.17.2 --- ocaml-dune.spec | 4 ++-- sources | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index ab8b1c1..971942e 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,8 +13,8 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.17.1 -Release: 2%{?dist} +Version: 3.17.2 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: diff --git a/sources b/sources index ba15820..1650c5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.17.1.tar.gz) = 2953a7c3cfddfe4ef82cbecafba75883f9ccfd96c5630313c95e49e10398d806b9dcd0385dff593a31752c915e20c1d1a0f5e0a20ad7195eb36f408c2d6b66f7 +SHA512 (dune-3.17.2.tar.gz) = 8feaf89c5bada83d840e6a1e42ae9308375b07dabc2363015b667bcff638dd78acd526c1a43dd4730ab675b4828f7304e503b97e9f53397e73ed4e644693f260 From bdff9da14578c96309afc082de3dd287bc1b2a4b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 15 Feb 2025 09:09:26 -0700 Subject: [PATCH 47/58] Add forgotten changelog entry --- ocaml-dune.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 971942e..73d3f51 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -590,6 +590,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Jan 23 2025 Jerry James - 3.17.2-1 +- Version 3.17.2 + * Fri Jan 17 2025 Fedora Release Engineering - 3.17.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3025091edcf70e5492573ae147401061ae779da1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 3 Apr 2025 11:55:45 -0600 Subject: [PATCH 48/58] Version 3.18.0 - ocaml-fmt is no longer bundled --- ocaml-dune.spec | 8 +++++--- sources | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 73d3f51..5a5c405 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,14 +13,13 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.17.2 +Version: 3.18.0 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: # ISC: # - vendor/cmdliner -# - vendor/fmt # - vendor/notty # - vendor/sha # - vendor/uutf @@ -77,7 +76,6 @@ BuildRequires: ocaml-lwt-devel >= 5.6.0 Provides: bundled(ocaml-build-path-prefix-map) = 0.3 Provides: bundled(ocaml-cmdliner) = 1.2.0 Provides: bundled(ocaml-fiber) = 3.7.0 -Provides: bundled(ocaml-fmt) = 0.8.10 Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 Provides: bundled(ocaml-inotify) = 2.3 Provides: bundled(ocaml-lwd) = 0.3 @@ -475,6 +473,7 @@ rm -fr otherlibs/dune-rpc-lwt dune-rpc-lwt.opam %build ./configure \ + --prefix %{_prefix} \ --bindir %{_bindir} \ --datadir %{_datadir} \ --docdir %{_prefix}/doc \ @@ -590,6 +589,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Apr 3 2025 Jerry James - 3.18.0-1 +- Version 3.18.0 + * Thu Jan 23 2025 Jerry James - 3.17.2-1 - Version 3.17.2 diff --git a/sources b/sources index 1650c5e..62aa12a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.17.2.tar.gz) = 8feaf89c5bada83d840e6a1e42ae9308375b07dabc2363015b667bcff638dd78acd526c1a43dd4730ab675b4828f7304e503b97e9f53397e73ed4e644693f260 +SHA512 (dune-3.18.0.tar.gz) = 5ea3923ccba5edd10c5b18df9b175c52096a21b62fc76269cd3be1ac93fa7589c9472403430161410995db75b1b419de4d3dd4d7e140b64d8151e29ba3137cbb From 44d69f6b11f17519626032a43af79db51beac6d3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 18 Apr 2025 10:17:40 -0600 Subject: [PATCH 49/58] Version 3.18.1 --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 5a5c405..53a3461 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,7 +13,7 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.18.0 +Version: 3.18.1 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -589,6 +589,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri Apr 18 2025 Jerry James - 3.18.1-1 +- Version 3.18.1 + * Thu Apr 3 2025 Jerry James - 3.18.0-1 - Version 3.18.0 diff --git a/sources b/sources index 62aa12a..9781f2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.18.0.tar.gz) = 5ea3923ccba5edd10c5b18df9b175c52096a21b62fc76269cd3be1ac93fa7589c9472403430161410995db75b1b419de4d3dd4d7e140b64d8151e29ba3137cbb +SHA512 (dune-3.18.1.tar.gz) = e9f188360f680bd4a2dad50a11f71e40aec42247f2eff2ac8f3071e6500620c1e631377e675f6b336c2ee9420d665885ce3509b7285bcef306521ba9b49c5208 From 85859ce6f2e6cbd1264ca2fe78f7eb759fdbc889 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 2 May 2025 09:50:02 -0600 Subject: [PATCH 50/58] Version 3.18.2 --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 53a3461..14fefc0 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,7 +13,7 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.18.1 +Version: 3.18.2 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -589,6 +589,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri May 02 2025 Jerry James - 3.18.2-1 +- Version 3.18.2 + * Fri Apr 18 2025 Jerry James - 3.18.1-1 - Version 3.18.1 diff --git a/sources b/sources index 9781f2c..605b252 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.18.1.tar.gz) = e9f188360f680bd4a2dad50a11f71e40aec42247f2eff2ac8f3071e6500620c1e631377e675f6b336c2ee9420d665885ce3509b7285bcef306521ba9b49c5208 +SHA512 (dune-3.18.2.tar.gz) = fffaee517e236f34b2d3d47be94c4a6eacb457e080757affadd4bc27dad1e5d0140f6d5a118c3342d2df13b2dd0ded3071df97af212b0217719a5c64e07c3e75 From f7bd4f297534114f39806dbb655ef51a72271a25 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 23 May 2025 10:30:54 -0600 Subject: [PATCH 51/58] Version 3.19.0 --- ocaml-dune-debuginfo.patch | 6 +++--- ocaml-dune.spec | 11 +++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ocaml-dune-debuginfo.patch b/ocaml-dune-debuginfo.patch index 8917c71..f3982f3 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 14fefc0..2008dc4 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,7 +13,7 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.18.2 +Version: 3.19.0 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -40,10 +40,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 / Fedora 39. ExcludeArch: %{ix86} @@ -80,7 +80,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 @@ -589,6 +589,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri May 23 2025 Jerry James - 3.19.0-1 +- Version 3.19.0 + * Fri May 02 2025 Jerry James - 3.18.2-1 - Version 3.18.2 diff --git a/sources b/sources index 605b252..9ba9865 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.18.2.tar.gz) = fffaee517e236f34b2d3d47be94c4a6eacb457e080757affadd4bc27dad1e5d0140f6d5a118c3342d2df13b2dd0ded3071df97af212b0217719a5c64e07c3e75 +SHA512 (dune-3.19.0.tar.gz) = 0d3210ecf34a6ed4a43fe76697067ef756902d444159f1ea676d228651d063290fb2a22f3077dfdf66dbf6b345ee68f0ad41f27cb62facdbca2672f75c989b03 From fdd91af0d820e3e97b984b4e819fce799ae06460 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 11 Jun 2025 09:56:01 -0600 Subject: [PATCH 52/58] Version 3.19.1 --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 2008dc4..05123af 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,7 +13,7 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.19.0 +Version: 3.19.1 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -589,6 +589,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Jun 11 2025 Jerry James - 3.19.1-1 +- Version 3.19.1 + * Fri May 23 2025 Jerry James - 3.19.0-1 - Version 3.19.0 diff --git a/sources b/sources index 9ba9865..b20f509 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.19.0.tar.gz) = 0d3210ecf34a6ed4a43fe76697067ef756902d444159f1ea676d228651d063290fb2a22f3077dfdf66dbf6b345ee68f0ad41f27cb62facdbca2672f75c989b03 +SHA512 (dune-3.19.1.tar.gz) = a101cad5d159a7134bd38d25968ea24189485b12f517e746c5b4c367a8d6ca0959ea59a71dc8c939e5d28a6ae644de9b3c12582579c044e3a081373ac680beb6 From 493ce7b7ef2d1e87c7e3fc57bdac52817c893e7d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Jul 2025 10:36:08 -0600 Subject: [PATCH 53/58] Remove old obsoletes --- ocaml-dune.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 05123af..a5ed357 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -228,10 +228,6 @@ License: MIT Requires: %{name}-configurator%{?_isa} = %{version}-%{release} Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} -# This can be removed when F40 reaches EOL -Obsoletes: %{name}-devel < 2.9.1-4 -Provides: %{name}-devel = %{version}-%{release} - %description configurator-devel The ocaml-dune-configurator-devel package contains libraries and signature files for developing applications that use From 890a33a2d05b620b35fd95bb4d8ca50357347164 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 23 Jul 2025 10:59:57 -0600 Subject: [PATCH 54/58] Migrate tests from STI to TMT (rhbz#2382985) --- .fmf/version | 1 + ocaml-dune.spec | 5 ++++- plans.fmf | 10 ++++++++++ tests/main.fmf | 2 ++ tests/tests.yml | 12 ------------ 5 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 .fmf/version create mode 100644 plans.fmf create mode 100644 tests/main.fmf delete mode 100755 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ocaml-dune.spec b/ocaml-dune.spec index a5ed357..9a8c93c 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -14,7 +14,7 @@ Name: ocaml-dune Version: 3.19.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -585,6 +585,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Jul 23 2025 Jerry James - 3.19.1-2 +- Migrate tests from STI to TMT (rhbz#2382985) + * Wed Jun 11 2025 Jerry James - 3.19.1-1 - Version 3.19.1 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..9337313 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,10 @@ +summary: Run all tests +discover: + how: fmf +execute: + how: tmt +prepare: + how: install + package: + - ocaml + - ocaml-dune diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..a5f5b31 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,2 @@ +summary: Basic test +test: ./basic-test.sh diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100755 index 6d126cf..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,12 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - ocaml - - ocaml-dune - tests: - - simple: - dir: . - run: ./basic-test.sh From 2f3375545a94eb4de13a276120f8f6192af7f0db Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 22 Aug 2025 09:45:02 -0600 Subject: [PATCH 55/58] Version 3.20.0 - Add BSD-2-Clause to License for bundled ocaml-blake3-mini - Add LGPL-2.1-or-later to License for code copied from 0install - Recompute Requires between subpackages --- ocaml-dune-debuginfo.patch | 8 ++--- ocaml-dune.spec | 67 ++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 48 insertions(+), 29 deletions(-) diff --git a/ocaml-dune-debuginfo.patch b/ocaml-dune-debuginfo.patch index f3982f3..906cec4 100644 --- a/ocaml-dune-debuginfo.patch +++ b/ocaml-dune-debuginfo.patch @@ -1,8 +1,8 @@ ---- 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" +--- dune-3.20.0/src/dune_lang/dune_project.ml.orig 2025-08-19 00:28:44.000000000 -0600 ++++ dune-3.20.0/src/dune_lang/dune_project.ml 2025-08-21 20:42:51.793195598 -0600 +@@ -425,7 +425,7 @@ let interpret_lang_and_extensions ~(lang + 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) -let map_workspace_root_default ~(lang : Lang.Instance.t) = lang.version >= (3, 0) +let map_workspace_root_default ~(lang : Lang.Instance.t) = false diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 9a8c93c..adace74 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,11 +13,13 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.19.1 -Release: 2%{?dist} +Version: 3.20.0 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: +# BSD-2-Clause: +# - vendor/ocaml-blake3-mini # ISC: # - vendor/cmdliner # - vendor/notty @@ -30,12 +32,15 @@ Summary: Composable build system for OCaml and Reason # - vendor/opam # - vendor/opam-file-format # - vendor/re +# LGPL-2.1-or-later +# - src/dune_pkg/opam_solver.* +# - src/sat/hash_set.* +# - src/sat/sat.* # MIT: # - vendor/build_path_prefix_map -# - vendor/fiber # - vendor/lwd # - vendor/spawn -License: MIT AND ISC AND LGPL-2.1-only AND LGPL-2.1-only WITH OCaml-LGPL-linking-exception +License: MIT AND BSD-2-Clause AND ISC AND LGPL-2.1-only AND LGPL-2.1-only WITH OCaml-LGPL-linking-exception AND LGPL-2.1-or-later URL: https://dune.build VCS: git:%{giturl}.git Source: %{giturl}/archive/%{version}/dune-%{version}.tar.gz @@ -75,11 +80,11 @@ BuildRequires: ocaml-lwt-devel >= 5.6.0 # See https://github.com/ocaml/dune/issues/220 Provides: bundled(ocaml-build-path-prefix-map) = 0.3 Provides: bundled(ocaml-cmdliner) = 1.2.0 -Provides: bundled(ocaml-fiber) = 3.7.0 Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 Provides: bundled(ocaml-inotify) = 2.3 Provides: bundled(ocaml-lwd) = 0.3 Provides: bundled(ocaml-notty) = 0.2.3 +Provides: bundled(ocaml-blake3-mini) = c6aa40e5f1973c2e6b736660ce2c8dcd3b3f9c9f Provides: bundled(ocaml-opam) = 2.2.0 Provides: bundled(ocaml-opam-file-format) = 2.1.6 Provides: bundled(ocaml-re) = 1.11.0 @@ -164,8 +169,11 @@ system, a mode to edit dune files, and flymake support for dune files. %package action-plugin Summary: API for writing dynamic dune actions License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-glob%{?_isa} = %{version}-%{release} +Requires: %{name}-rpc%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering%{?_isa} = %{version}-%{release} +Requires: ocaml-stdune%{?_isa} = %{version}-%{release} %description action-plugin This experimental library provides an API for writing dynamic Dune @@ -178,6 +186,14 @@ Summary: Development files for %{name}-action-plugin License: MIT Requires: %{name}-action-plugin%{?_isa} = %{version}-%{release} Requires: %{name}-glob-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-rpc-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} +%if !0%{?rhel} +Requires: ocaml-csexp-devel%{?_isa} +Requires: ocaml-pp-devel%{?_isa} +%endif %description action-plugin-devel The ocaml-dune-action-plugin-devel package contains libraries and @@ -187,7 +203,6 @@ ocaml-dune-action-plugin. %package build-info Summary: Embed build information in an executable License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} %description build-info The build-info library allows access to information about how an @@ -208,7 +223,6 @@ files for developing applications that use ocaml-dune-build-info. %package configurator Summary: Helper library for gathering system configuration License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: ocaml-stdune%{?_isa} = %{version}-%{release} %description configurator @@ -227,6 +241,9 @@ Summary: Development files for %{name}-configurator License: MIT Requires: %{name}-configurator%{?_isa} = %{version}-%{release} Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} +%if !0%{?rhel} +Requires: ocaml-csexp-devel%{?_isa} +%endif %description configurator-devel The ocaml-dune-configurator-devel package contains libraries and @@ -236,8 +253,9 @@ ocaml-dune-configurator. %package glob Summary: Parser and interpreter for dune language globs License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-private-libs%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering%{?_isa} = %{version}-%{release} Requires: ocaml-stdune%{?_isa} = %{version}-%{release} %description glob @@ -249,7 +267,12 @@ Summary: Development files for %{name}-glob License: MIT Requires: %{name}-glob%{?_isa} = %{version}-%{release} Requires: %{name}-private-libs-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering-devel%{?_isa} = %{version}-%{release} Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} +%if !0%{?rhel} +Requires: ocaml-pp-devel%{?_isa} +%endif %description glob-devel The ocaml-dune-glob-devel package contains libraries and signature files @@ -258,8 +281,6 @@ for developing applications that use ocaml-dune-glob. %package private-libs Summary: Private dune libraries License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: ocaml-stdune%{?_isa} = %{version}-%{release} %description private-libs This package contains code that is shared between various dune-xxx @@ -270,7 +291,6 @@ no stability guarantee. Summary: Development files for %{name}-private-libs License: MIT Requires: %{name}-private-libs%{?_isa} = %{version}-%{release} -Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} %description private-libs-devel The ocaml-dune-private-libs-devel package contains libraries and @@ -279,7 +299,8 @@ signature files for other dune packages. Do not use. %package rpc Summary: Communicate with dune using rpc License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering%{?_isa} = %{version}-%{release} Requires: ocaml-stdune%{?_isa} = %{version}-%{release} Requires: ocaml-xdg%{?_isa} = %{version}-%{release} @@ -290,8 +311,14 @@ This package contains a library used to communicate with dune over rpc. Summary: Development files for %{name}-rpc License: MIT Requires: %{name}-rpc%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering-devel%{?_isa} = %{version}-%{release} Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} Requires: ocaml-xdg-devel%{?_isa} = %{version}-%{release} +%if !0%{?rhel} +Requires: ocaml-csexp-devel%{?_isa} +Requires: ocaml-pp-devel%{?_isa} +%endif %description rpc-devel The ocaml-dune-rpc-devel package contains libraries and signature files @@ -301,7 +328,6 @@ for developing applications that use ocaml-rpc. %package rpc-lwt Summary: Communicate with dune using rpc and Lwt License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-rpc%{?_isa} = %{version}-%{release} %description rpc-lwt @@ -326,7 +352,6 @@ files for developing applications that use ocaml-rpc-lwt. %package site Summary: Embed location information inside executables and libraries License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-private-libs%{?_isa} = %{version}-%{release} %description site @@ -346,7 +371,6 @@ for developing applications that use ocaml-dune-site. %package -n ocaml-chrome-trace Summary: Chrome trace event generation library License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n ocaml-chrome-trace Library to output trace data to a file in Chrome's trace_event format. @@ -365,7 +389,6 @@ developing applications that use ocaml-dyn. %package -n ocaml-dyn Summary: Dynamic types License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: ocaml-ordering%{?_isa} = %{version}-%{release} %description -n ocaml-dyn @@ -376,9 +399,6 @@ Summary: Development files for ocaml-dyn License: MIT Requires: ocaml-dyn%{?_isa} = %{version}-%{release} Requires: ocaml-ordering-devel%{?_isa} = %{version}-%{release} -%if !0%{?rhel} -Requires: ocaml-pp-devel%{?_isa} -%endif %description -n ocaml-dyn-devel The ocaml-dyn-devel package contains libraries and signature files for @@ -387,7 +407,6 @@ developing applications that use ocaml-dyn. %package -n ocaml-ocamlc-loc Summary: Parse OCaml compiler output into structured form License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: ocaml-dyn%{?_isa} = %{version}-%{release} %description -n ocaml-ocamlc-loc @@ -406,7 +425,6 @@ for developing applications that use ocaml-ocamlc-loc. %package -n ocaml-ordering Summary: Element ordering License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n ocaml-ordering Element ordering in OCaml. @@ -423,8 +441,8 @@ for developing applications that use ocaml-ordering. %package -n ocaml-stdune Summary: Dune's unstable standard library License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} Requires: ocaml-dyn%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering%{?_isa} = %{version}-%{release} %description -n ocaml-stdune This package contains Dune's unstable standard library. @@ -434,8 +452,10 @@ Summary: Development files for ocaml-stdune License: MIT Requires: ocaml-stdune%{?_isa} = %{version}-%{release} Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering-devel%{?_isa} = %{version}-%{release} %if !0%{?rhel} Requires: ocaml-csexp-devel%{?_isa} +Requires: ocaml-pp-devel%{?_isa} %endif %description -n ocaml-stdune-devel @@ -445,7 +465,6 @@ for developing applications that use ocaml-stdune. %package -n ocaml-xdg Summary: XDG Base Directory Specification License: MIT -Requires: %{name}%{?_isa} = %{version}-%{release} %description -n ocaml-xdg This package contains the XDG Base Directory Specification. diff --git a/sources b/sources index b20f509..d0eccb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.19.1.tar.gz) = a101cad5d159a7134bd38d25968ea24189485b12f517e746c5b4c367a8d6ca0959ea59a71dc8c939e5d28a6ae644de9b3c12582579c044e3a081373ac680beb6 +SHA512 (dune-3.20.0.tar.gz) = 6723652837f9c1349bfdbfc6514ff379f9460baef3be35a836a6d8f898278a015bfd35cef5c83c510728526dd2f9a1d8a09f0339c71db5720593306467b6fade From 836822abdab2ff04545f66b453678813681e26fa Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 25 Aug 2025 08:16:16 -0600 Subject: [PATCH 56/58] Version 3.20.1 --- ocaml-dune.spec | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index adace74..f37340d 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,7 +13,7 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.20.0 +Version: 3.20.1 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason diff --git a/sources b/sources index d0eccb4..60c9fe6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.20.0.tar.gz) = 6723652837f9c1349bfdbfc6514ff379f9460baef3be35a836a6d8f898278a015bfd35cef5c83c510728526dd2f9a1d8a09f0339c71db5720593306467b6fade +SHA512 (dune-3.20.1.tar.gz) = 412713daa433de9225927deef8c448f57f6a0af18400bbb2822b391ab88b308ab3fbde6f7389cdfaa4e977a1bb37ea499851609212a7744aacda424916ff6a1f From 146142d656b593fbd58836b1b1734504b2103ae0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 16 Sep 2025 08:36:28 -0600 Subject: [PATCH 57/58] Version 3.20.2 --- ocaml-dune.spec | 17 +++++++++++++---- sources | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index f37340d..27b7227 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -13,7 +13,7 @@ %global giturl https://github.com/ocaml/dune Name: ocaml-dune -Version: 3.20.1 +Version: 3.20.2 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -604,16 +604,25 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Sep 16 2025 Jerry James - 3.20.2-1 +- Version 3.20.2 + +* Mon Aug 25 2025 Jerry James - 3.20.1-1 +- Version 3.20.1 + +* Fri Aug 22 2025 Jerry James - 3.20.0-1 +- Version 3.20.0 + * Wed Jul 23 2025 Jerry James - 3.19.1-2 - Migrate tests from STI to TMT (rhbz#2382985) -* Wed Jun 11 2025 Jerry James - 3.19.1-1 +* Wed Jun 11 2025 Jerry James - 3.19.1-1 - Version 3.19.1 -* Fri May 23 2025 Jerry James - 3.19.0-1 +* Fri May 23 2025 Jerry James - 3.19.0-1 - Version 3.19.0 -* Fri May 02 2025 Jerry James - 3.18.2-1 +* Fri May 02 2025 Jerry James - 3.18.2-1 - Version 3.18.2 * Fri Apr 18 2025 Jerry James - 3.18.1-1 diff --git a/sources b/sources index 60c9fe6..828aee6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.20.1.tar.gz) = 412713daa433de9225927deef8c448f57f6a0af18400bbb2822b391ab88b308ab3fbde6f7389cdfaa4e977a1bb37ea499851609212a7744aacda424916ff6a1f +SHA512 (dune-3.20.2.tar.gz) = efb4376e03a3e760ee230c22ba8ac788623382437d9e3551fdd6bacdca1c6aa2db90246feb011d3d0e7ba3afa47161ebd06c80cfb24e357a82f7764bf003e355 From 06a86cad81cd0360ff7edca6c71197da2fb3c33e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 13:08:55 +0100 Subject: [PATCH 58/58] OCaml 5.4.0 rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 27b7227..9409c70 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -14,7 +14,7 @@ Name: ocaml-dune Version: 3.20.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -604,6 +604,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 3.20.2-2 +- OCaml 5.4.0 rebuild + * Tue Sep 16 2025 Jerry James - 3.20.2-1 - Version 3.20.2