From 8a80202e949c712f28b27ea989f9d712a6f37e04 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 26 Dec 2024 20:01:26 -0700 Subject: [PATCH 01/16] 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 02/16] 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 03/16] 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 8bd26a3f0e95f27c7e41894117b76fab54c46f2c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 28 Jan 2025 16:24:20 -0700 Subject: [PATCH 04/16] OCaml 5.2.1 rebuild for Fedora 41 - Version 3.17.2 - Update License field for changes in vendored dependencies - Drop upstreamed furo theme patch --- ocaml-dune.spec | 26 ++++---- sources | 2 +- use-furo-theme.patch | 141 ------------------------------------------- 3 files changed, 13 insertions(+), 156 deletions(-) delete mode 100644 use-furo-theme.patch diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 3650b67..9ac6569 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.2 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,12 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Tue Jan 28 2025 Jerry James - 3.17.2-1 +- OCaml 5.2.1 rebuild for Fedora 41 +- Version 3.17.2 +- 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..1650c5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.16.1.tar.gz) = 18e8022c5fa276e06f788cf25a4d6d08e3247c546cd69a5206d4e78ece1f47a615c6d5842e68e1fa7908cae7ae8c6e4f31d2eb835d97b5e6b5e4154957139e9f +SHA512 (dune-3.17.2.tar.gz) = 8feaf89c5bada83d840e6a1e42ae9308375b07dabc2363015b667bcff638dd78acd526c1a43dd4730ab675b4828f7304e503b97e9f53397e73ed4e644693f260 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 bdff9da14578c96309afc082de3dd287bc1b2a4b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 15 Feb 2025 09:09:26 -0700 Subject: [PATCH 05/16] 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 06/16] 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 07/16] 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 08/16] 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 09/16] 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 10/16] 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 11/16] 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 12/16] 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 13/16] 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 14/16] 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 15/16] 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 16/16] 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