From b2bdbf6204a6872099f5af2c37e24797c61172ce Mon Sep 17 00:00:00 2001 From: Andy Li Date: Fri, 8 Mar 2019 11:35:20 +0800 Subject: [PATCH 001/141] Updated to latest upstream release (#1686466). --- .gitignore | 1 + ocaml-dune.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e725bf1..48cacb6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dune-1.7.3.tar.gz +/dune-1.8.0.tar.gz diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 4995388..2a52ad5 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,5 +1,5 @@ Name: ocaml-dune -Version: 1.7.3 +Version: 1.8.0 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -105,6 +105,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Fri Mar 08 2019 Andy Li - 1.8.0-1 +- Updated to latest upstream release (#1686466). + * Fri Mar 01 2019 Andy Li - 1.7.3-1 - Renamed source package from jbuilder to ocaml-dune. - Updated URLs and license according to upstream changes. diff --git a/sources b/sources index c6ca616..a6eff96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-1.7.3.tar.gz) = 744ff584acc1695f3720b142a5bc00a26901d488531629fe386f4f3b02f13b86b74e7ba5801d468f4b8ebfcee9bd15017e6dd0d0c2ae242eaef40aa99668a39d +SHA512 (dune-1.8.0.tar.gz) = 9e01c3b342c7b088ef5535d63ec6188925e1ddd897af4a965f4231c41326023c7543765a72834f7696bc3fa6ffc0dfdd5b44277a55f39302fcbfba9d535755e8 From a1a02d530f26c7657cc1bc78d24797eeb87f3d54 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Wed, 13 Mar 2019 02:37:43 +0800 Subject: [PATCH 002/141] Updated to latest upstream release (#1686836). --- .gitignore | 1 + ocaml-dune.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 48cacb6..9ab4b0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /dune-1.7.3.tar.gz /dune-1.8.0.tar.gz +/dune-1.8.2.tar.gz diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 2a52ad5..8709a07 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,5 +1,5 @@ Name: ocaml-dune -Version: 1.8.0 +Version: 1.8.2 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -105,6 +105,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Wed Mar 13 2019 Andy Li - 1.8.2-1 +- Updated to latest upstream release (#1686836). + * Fri Mar 08 2019 Andy Li - 1.8.0-1 - Updated to latest upstream release (#1686466). diff --git a/sources b/sources index a6eff96..d83750b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-1.8.0.tar.gz) = 9e01c3b342c7b088ef5535d63ec6188925e1ddd897af4a965f4231c41326023c7543765a72834f7696bc3fa6ffc0dfdd5b44277a55f39302fcbfba9d535755e8 +SHA512 (dune-1.8.2.tar.gz) = 0ac0ab76a480af3fa8d54f75aceb4c75cb4812790cc07c816e408ee8333f00a6e882e7e0669be96ee8dc9274b468c16d9f8c0c3960709e53975dffffef2be609 From c73c65fa07e5532546b2411ae3210e7c162601a0 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Wed, 13 Mar 2019 03:44:03 +0800 Subject: [PATCH 003/141] Add missing dependency on sphinx_rtd_theme. --- ocaml-dune.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 8709a07..afb6b9a 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -17,6 +17,7 @@ BuildRequires: ocaml-findlib-devel # Depend on /usr/bin/sphinx-build for python version invariance. BuildRequires: /usr/bin/sphinx-build +BuildRequires: python3-sphinx_rtd_theme # Required by tests. BuildRequires: git @@ -107,6 +108,7 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %changelog * Wed Mar 13 2019 Andy Li - 1.8.2-1 - Updated to latest upstream release (#1686836). +- Add missing dependency on sphinx_rtd_theme. * Fri Mar 08 2019 Andy Li - 1.8.0-1 - Updated to latest upstream release (#1686466). From 6a5a36b0b3560459d69a267a1e7da16f04613aa6 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Wed, 10 Apr 2019 11:57:51 +0800 Subject: [PATCH 004/141] Update to 1.9.0. --- .gitignore | 1 + ocaml-dune.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9ab4b0b..aeb4903 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /dune-1.7.3.tar.gz /dune-1.8.0.tar.gz /dune-1.8.2.tar.gz +/dune-1.9.0.tar.gz diff --git a/ocaml-dune.spec b/ocaml-dune.spec index afb6b9a..84df7db 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,5 +1,5 @@ Name: ocaml-dune -Version: 1.8.2 +Version: 1.9.0 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -106,6 +106,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Wed Apr 10 2019 Andy Li - 1.9.0-1 +- Updated to latest upstream release (#1698022). + * Wed Mar 13 2019 Andy Li - 1.8.2-1 - Updated to latest upstream release (#1686836). - Add missing dependency on sphinx_rtd_theme. diff --git a/sources b/sources index d83750b..0c75dc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-1.8.2.tar.gz) = 0ac0ab76a480af3fa8d54f75aceb4c75cb4812790cc07c816e408ee8333f00a6e882e7e0669be96ee8dc9274b468c16d9f8c0c3960709e53975dffffef2be609 +SHA512 (dune-1.9.0.tar.gz) = 3666d07bc339fb95796c8422b9f38d8aa5eb68e393de7b94a269af865de11766866bad143d7552daf69e537e7b9a186a53e7f16bdbbd758096d817fc8d9b5302 From 0afa6319076897da232bbb879ed136daf001c9f3 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Thu, 11 Apr 2019 18:43:28 +0800 Subject: [PATCH 005/141] update to 1.9.1 --- .gitignore | 1 + ocaml-dune.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aeb4903..cc80b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /dune-1.8.0.tar.gz /dune-1.8.2.tar.gz /dune-1.9.0.tar.gz +/dune-1.9.1.tar.gz diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 84df7db..6ef7bfa 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,5 +1,5 @@ Name: ocaml-dune -Version: 1.9.0 +Version: 1.9.1 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -106,6 +106,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Thu Apr 11 2019 Andy Li - 1.9.1-1 +- Updated to latest upstream release (#1698732). + * Wed Apr 10 2019 Andy Li - 1.9.0-1 - Updated to latest upstream release (#1698022). diff --git a/sources b/sources index 0c75dc7..1764090 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-1.9.0.tar.gz) = 3666d07bc339fb95796c8422b9f38d8aa5eb68e393de7b94a269af865de11766866bad143d7552daf69e537e7b9a186a53e7f16bdbbd758096d817fc8d9b5302 +SHA512 (dune-1.9.1.tar.gz) = 636d39328e89761961da2f0371fe1bb60af50b51858883ac31a8c667b2fceff6b1b193663d9acf4c073ef06c5e0382ccda653a2be2d26496b1ad706bbc9d3eed From 1f11cd451a253d261790ecdf3ecd5ec1882f539f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Apr 2019 09:06:25 +0100 Subject: [PATCH 006/141] OCaml 4.08.0 (beta 3) rebuild. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 6ef7bfa..79e82df 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -106,6 +106,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Tue Apr 30 2019 Richard W.M. Jones - 1.9.1-2 +- OCaml 4.08.0 (beta 3) rebuild. + * Thu Apr 11 2019 Andy Li - 1.9.1-1 - Updated to latest upstream release (#1698732). From 904f3c9fac69076e554803e3a21d0f76044d20d5 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Thu, 16 May 2019 16:52:17 +0800 Subject: [PATCH 007/141] Updated to latest upstream release (#1705660). --- ocaml-dune.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 79e82df..b90a4ef 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune -Version: 1.9.1 -Release: 2%{?dist} +Version: 1.9.3 +Release: 1%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -106,6 +106,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Thu May 16 2019 Andy Li - 1.9.3-1 +- Updated to latest upstream release (#1705660). + * Tue Apr 30 2019 Richard W.M. Jones - 1.9.1-2 - OCaml 4.08.0 (beta 3) rebuild. From d1b193a3a828eb2a55d0e57ab5844a9ba76ae1e2 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Thu, 16 May 2019 16:55:03 +0800 Subject: [PATCH 008/141] add source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cc80b7a..6111eb8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /dune-1.8.2.tar.gz /dune-1.9.0.tar.gz /dune-1.9.1.tar.gz +/dune-1.9.3.tar.gz diff --git a/sources b/sources index 1764090..67cbe91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-1.9.1.tar.gz) = 636d39328e89761961da2f0371fe1bb60af50b51858883ac31a8c667b2fceff6b1b193663d9acf4c073ef06c5e0382ccda653a2be2d26496b1ad706bbc9d3eed +SHA512 (dune-1.9.3.tar.gz) = acefaa83c27896312e60d0062b2457931d7e3f0117270f39d649a4f9cf7f84eba2efc6f3c20b2d5f9a894e8886cc3b6ffe0fdeb35787ca213169f58abca74b19 From 391b15504a9175eb39be7ee47b9ff3b9c9351ab8 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Sun, 16 Jun 2019 01:47:57 +0800 Subject: [PATCH 009/141] Updated to latest upstream release (#1715394). --- .gitignore | 1 + ocaml-dune.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6111eb8..0a17328 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /dune-1.9.0.tar.gz /dune-1.9.1.tar.gz /dune-1.9.3.tar.gz +/dune-1.10.0.tar.gz diff --git a/ocaml-dune.spec b/ocaml-dune.spec index b90a4ef..105902d 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,5 +1,5 @@ Name: ocaml-dune -Version: 1.9.3 +Version: 1.10.0 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -77,7 +77,7 @@ mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_mandir}/man1 mkdir -p %{buildroot}%{_mandir}/man5 -cp -av _boot/default/bin/main_dune.exe %{buildroot}%{_bindir}/dune +cp -av _boot/default/bin/main/main_dune.exe %{buildroot}%{_bindir}/dune ln -sfvbn dune %{buildroot}%{_bindir}/jbuilder cp -av _boot/default/doc/*.1 %{buildroot}%{_mandir}/man1/ cp -av _boot/default/doc/*.5 %{buildroot}%{_mandir}/man5/ @@ -106,6 +106,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Sun Jun 16 2019 Andy Li - 1.10.0-1 +- Updated to latest upstream release (#1715394). + * Thu May 16 2019 Andy Li - 1.9.3-1 - Updated to latest upstream release (#1705660). diff --git a/sources b/sources index 67cbe91..667500f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-1.9.3.tar.gz) = acefaa83c27896312e60d0062b2457931d7e3f0117270f39d649a4f9cf7f84eba2efc6f3c20b2d5f9a894e8886cc3b6ffe0fdeb35787ca213169f58abca74b19 +SHA512 (dune-1.10.0.tar.gz) = 15c3f5da31ae6062e41cb9e4137b740f8b227b1e59b0f00b9b2f7705bbe517da184835be007e6bb980e3615ce2ac71de67bdda92605caee1cbc0a27f34f67a1e From c1ebc8d06d049160ad0a52844110841e22f08f7e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Jun 2019 19:25:05 +0100 Subject: [PATCH 010/141] OCaml 4.08.0 (final) rebuild. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 105902d..aea16ae 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -106,6 +106,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Thu Jun 27 2019 Richard W.M. Jones - 1.10.0-2 +- OCaml 4.08.0 (final) rebuild. + * Sun Jun 16 2019 Andy Li - 1.10.0-1 - Updated to latest upstream release (#1715394). From 39473a4e59045d1e1ee59d025ba7b4557185d85d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 22:51:47 +0000 Subject: [PATCH 011/141] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 aea16ae..85dae1f 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -106,6 +106,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jun 27 2019 Richard W.M. Jones - 1.10.0-2 - OCaml 4.08.0 (final) rebuild. From f1b8e426d56525c80e4519b8234a7998ce8112c6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 31 Jul 2019 17:23:35 +0100 Subject: [PATCH 012/141] OCaml 4.08.1 (rc2) rebuild. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 85dae1f..a227fe7 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -106,6 +106,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Wed Jul 31 2019 Richard W.M. Jones - 1.10.0-4 +- OCaml 4.08.1 (rc2) rebuild. + * Thu Jul 25 2019 Fedora Release Engineering - 1.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e1c4ce182df791b0d26196dadd80e80d4d4c40de Mon Sep 17 00:00:00 2001 From: Ben Rosser Date: Tue, 6 Aug 2019 14:33:41 -0400 Subject: [PATCH 013/141] Add new development subpackage. Install all compiled dune libraries. --- ocaml-dune.spec | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index a227fe7..65cbc61 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.10.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -11,7 +11,6 @@ License: MIT and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz - BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-findlib-devel @@ -49,6 +48,14 @@ 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. +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and +signature files for developing applications that use %{name}. + %package doc Summary: HTML documentation for %{name} Requires: %{name} = %{version}-%{release} @@ -82,6 +89,17 @@ ln -sfvbn dune %{buildroot}%{_bindir}/jbuilder cp -av _boot/default/doc/*.1 %{buildroot}%{_mandir}/man1/ cp -av _boot/default/doc/*.5 %{buildroot}%{_mandir}/man5/ +# Dune also has libraries now, which need to be installed via the standard way. +mkdir -p %{buildroot}%{_libdir}/ocaml/%{libname}/ +cp -aLr _boot/install/default/lib/%{libname}/* %{buildroot}%{_libdir}/ocaml/%{libname}/ + +# Remove *.ml files from installation. +# This is a little annoying. ocaml/dune has a bunch of subdirectories that actually contain code. +# But the "_wp" subdirectory *itself* contains subdirectories with compiled code. +# So I've special-cased that one. +rm -fv %{buildroot}%{_libdir}/ocaml/%{libname}/*/*.ml +rm -fv %{buildroot}%{_libdir}/ocaml/%{libname}/_wp/*/*.ml + # Install documentation by way of pkgdocdir. mkdir -p %{buildroot}%{_pkgdocdir}/ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ @@ -99,6 +117,30 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_bindir}/dune %{_mandir}/man*/dune* %dir %{_pkgdocdir} +%{_libdir}/ocaml/%{libname} +%ifarch %{ocaml_native_compiler} +%exclude %{_libdir}/ocaml/%{libname}/*/*.a +%exclude %{_libdir}/ocaml/%{libname}/*/*.cmxa +%exclude %{_libdir}/ocaml/%{libname}/*/*.cmx +%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.a +%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.cmxa +%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.cmx +%endif +%exclude %{_libdir}/ocaml/%{libname}/*/*.mli +%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.mli + +%files devel +%ifarch %{ocaml_native_compiler} +%{_libdir}/ocaml/%{libname}/*/*.a +%{_libdir}/ocaml/%{libname}/*/*.cmxa +%{_libdir}/ocaml/%{libname}/*/*.cmx +%{_libdir}/ocaml/%{libname}/_wp/*/*.a +%{_libdir}/ocaml/%{libname}/_wp/*/*.cmxa +%{_libdir}/ocaml/%{libname}/_wp/*/*.cmx +%endif +%{_libdir}/ocaml/%{libname}/*/*.mli +# There do not seem to be headers in the _wp subdirectory. +#{_libdir}/ocaml/{libname}/_wp/*/*.mli %files doc %exclude %{_pkgdocdir}/README.md @@ -106,6 +148,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Tue Aug 06 2019 Ben Rosser - 1.10.0-5 +- Install dune libraries. Add new ocaml-dune subpackage (rhbz#1737414). + * Wed Jul 31 2019 Richard W.M. Jones - 1.10.0-4 - OCaml 4.08.1 (rc2) rebuild. From efb9d7eaea85db85d8c675cab5409fd80653e27a Mon Sep 17 00:00:00 2001 From: Ben Rosser Date: Tue, 6 Aug 2019 15:00:57 -0400 Subject: [PATCH 014/141] Install dune libraries. Add new ocaml-dune subpackage (rhbz#1737414). --- ocaml-dune.spec | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 4995388..86d7cc8 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -48,6 +48,14 @@ 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. +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and +signature files for developing applications that use %{name}. + %package doc Summary: HTML documentation for %{name} Requires: %{name} = %{version}-%{release} @@ -81,6 +89,17 @@ ln -sfvbn dune %{buildroot}%{_bindir}/jbuilder cp -av _boot/default/doc/*.1 %{buildroot}%{_mandir}/man1/ cp -av _boot/default/doc/*.5 %{buildroot}%{_mandir}/man5/ +# Dune also has libraries now, which need to be installed via the standard way. +mkdir -p %{buildroot}%{_libdir}/ocaml/%{libname}/ +cp -aLr _boot/install/default/lib/%{libname}/* %{buildroot}%{_libdir}/ocaml/%{libname}/ + +# Remove *.ml files from installation. +# This is a little annoying. ocaml/dune has a bunch of subdirectories that actually contain code. +# But the "_wp" subdirectory *itself* contains subdirectories with compiled code. +# So I've special-cased that one. +rm -fv %{buildroot}%{_libdir}/ocaml/%{libname}/*/*.ml +rm -fv %{buildroot}%{_libdir}/ocaml/%{libname}/_wp/*/*.ml + # Install documentation by way of pkgdocdir. mkdir -p %{buildroot}%{_pkgdocdir}/ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ @@ -98,6 +117,30 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_bindir}/dune %{_mandir}/man*/dune* %dir %{_pkgdocdir} +%{_libdir}/ocaml/%{libname} +%ifarch %{ocaml_native_compiler} +%exclude %{_libdir}/ocaml/%{libname}/*/*.a +%exclude %{_libdir}/ocaml/%{libname}/*/*.cmxa +%exclude %{_libdir}/ocaml/%{libname}/*/*.cmx +%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.a +%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.cmxa +%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.cmx +%endif +%exclude %{_libdir}/ocaml/%{libname}/*/*.mli +%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.mli + +%files devel +%ifarch %{ocaml_native_compiler} +%{_libdir}/ocaml/%{libname}/*/*.a +%{_libdir}/ocaml/%{libname}/*/*.cmxa +%{_libdir}/ocaml/%{libname}/*/*.cmx +%{_libdir}/ocaml/%{libname}/_wp/*/*.a +%{_libdir}/ocaml/%{libname}/_wp/*/*.cmxa +%{_libdir}/ocaml/%{libname}/_wp/*/*.cmx +%endif +%{_libdir}/ocaml/%{libname}/*/*.mli +# There do not seem to be headers in the _wp subdirectory. +#{_libdir}/ocaml/{libname}/_wp/*/*.mli %files doc %exclude %{_pkgdocdir}/README.md @@ -105,6 +148,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Tue Aug 06 2019 Ben Rosser - 1.7.3-2 +- Install dune libraries. Add new ocaml-dune subpackage (rhbz#1737414). + * Fri Mar 01 2019 Andy Li - 1.7.3-1 - Renamed source package from jbuilder to ocaml-dune. - Updated URLs and license according to upstream changes. From 5b72f4d47aab8305241a33200fec7df6c4adb663 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 8 Aug 2019 16:21:06 +0100 Subject: [PATCH 015/141] New version 1.11.0 (also required for camomile 1.0.2). --- .gitignore | 1 + ocaml-dune.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0a17328..59e40b3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /dune-1.9.1.tar.gz /dune-1.9.3.tar.gz /dune-1.10.0.tar.gz +/dune-1.11.0.tar.gz diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 65cbc61..a34798a 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune -Version: 1.10.0 -Release: 5%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -148,6 +148,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Thu Aug 08 2019 Richard W.M. Jones - 1.11.0-1 +- New version 1.11.0 (also required for camomile 1.0.2). + * Tue Aug 06 2019 Ben Rosser - 1.10.0-5 - Install dune libraries. Add new ocaml-dune subpackage (rhbz#1737414). diff --git a/sources b/sources index 667500f..81a6271 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-1.10.0.tar.gz) = 15c3f5da31ae6062e41cb9e4137b740f8b227b1e59b0f00b9b2f7705bbe517da184835be007e6bb980e3615ce2ac71de67bdda92605caee1cbc0a27f34f67a1e +SHA512 (dune-1.11.0.tar.gz) = 8c5133527b20c1728b6097b5ae78edf1f5650849787f1f0cd11b4eec620daa597778af6945664164624d5a2d80f4a1d25532c899ef391265ecaf1188ae57b769 From b3bad1d821082c0b8a93407f5fcaaa580499f4d4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 8 Aug 2019 17:02:46 +0100 Subject: [PATCH 016/141] Disable armv7 temporarily. See https://github.com/ocaml/dune/issues/2527 --- ocaml-dune.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index a34798a..9d4a1d5 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,6 +11,10 @@ License: MIT and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz +# Dune 1.11 fails to build on armv7, see +# https://github.com/ocaml/dune/issues/2527 +ExcludeArch: %{arm} + BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-findlib-devel From 8868602918fb4406b0f487c775aea982e66b01f5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 9 Aug 2019 08:57:04 +0100 Subject: [PATCH 017/141] Revert "Disable armv7 temporarily." This reverts commit b3bad1d821082c0b8a93407f5fcaaa580499f4d4. --- ocaml-dune.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 9d4a1d5..a34798a 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,10 +11,6 @@ License: MIT and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz -# Dune 1.11 fails to build on armv7, see -# https://github.com/ocaml/dune/issues/2527 -ExcludeArch: %{arm} - BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-findlib-devel From 549469ed2ffcde3ad06915a02a85947bb461a2e4 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 9 Aug 2019 10:38:35 +0100 Subject: [PATCH 018/141] Work around nodynlink issue on armv7. https://github.com/ocaml/dune/issues/2527 --- ...4b09a8c06871635d5fd98c3a37089bbde6d9.patch | 28 +++++++++++++++++++ ocaml-dune.spec | 17 +++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch diff --git a/15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch b/15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch new file mode 100644 index 0000000..0c2ba1f --- /dev/null +++ b/15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch @@ -0,0 +1,28 @@ +From 15c04b09a8c06871635d5fd98c3a37089bbde6d9 Mon Sep 17 00:00:00 2001 +From: Jeremie Dimino +Date: Thu, 8 Aug 2019 23:31:27 +0100 +Subject: [PATCH] remove nodynlink optimisation + +Signed-off-by: Jeremie Dimino +--- + src/exe_rules.ml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/exe_rules.ml b/src/exe_rules.ml +index 834afab21..eda12ee4d 100644 +--- a/src/exe_rules.ml ++++ b/src/exe_rules.ml +@@ -104,11 +104,11 @@ let executables_rules ~sctx ~dir ~dir_kind ~expander + else + Some js_of_ocaml + in +- let dynlink = ++ let dynlink = true (* + Dune_file.Executables.Link_mode.Set.exists exes.modes ~f:(fun mode -> + match mode.kind with + | Shared_object -> true +- | _ -> false) ++ | _ -> false)*) + in + Compilation_context.create () + ~super_context:sctx diff --git a/ocaml-dune.spec b/ocaml-dune.spec index a34798a..1ec6008 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -11,6 +11,9 @@ License: MIT and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz +# See: https://github.com/ocaml/dune/issues/2527 +Patch1: 15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch + BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-findlib-devel @@ -66,7 +69,13 @@ BuildArch: noarch HTML documentation for dune, a composable build system for OCaml. %prep -%autosetup -n %{libname}-%{version} -p1 +# Restore autosetup once we have fixed this upstream issue: +# https://github.com/ocaml/dune/issues/2527 +#autosetup -n %{libname}-%{version} -p1 +%setup -n %{libname}-%{version} +%ifarch %{arm} +%patch1 -p1 +%endif %build # The dune build script figures out if the native code compiler is available @@ -148,6 +157,10 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Fri Aug 09 2019 Richard W.M. Jones - 1.11.0-2 +- Work around nodynlink issue on armv7. + https://github.com/ocaml/dune/issues/2527 + * Thu Aug 08 2019 Richard W.M. Jones - 1.11.0-1 - New version 1.11.0 (also required for camomile 1.0.2). From a1d73a2da42007b78b0bd5a0d23c5bc22802677a Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 16 Aug 2019 11:29:11 +0100 Subject: [PATCH 019/141] OCaml 4.08.1 (final) rebuild. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 1ec6008..7412c4a 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.11.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -157,6 +157,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Fri Aug 16 2019 Richard W.M. Jones - 1.11.0-3 +- OCaml 4.08.1 (final) rebuild. + * Fri Aug 09 2019 Richard W.M. Jones - 1.11.0-2 - Work around nodynlink issue on armv7. https://github.com/ocaml/dune/issues/2527 From 401aabeea709ae84ba7ad18840504d7e551bc11d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 6 Dec 2019 11:53:39 +0000 Subject: [PATCH 020/141] OCaml 4.09.0 (final) rebuild. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 7412c4a..5d3b7ff 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,6 +1,6 @@ Name: ocaml-dune Version: 1.11.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A composable build system for OCaml %global libname %(echo %{name} | sed -e 's/^ocaml-//') @@ -157,6 +157,9 @@ cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %doc %{_pkgdocdir}/* %changelog +* Fri Dec 06 2019 Richard W.M. Jones - 1.11.0-4 +- OCaml 4.09.0 (final) rebuild. + * Fri Aug 16 2019 Richard W.M. Jones - 1.11.0-3 - OCaml 4.08.1 (final) rebuild. From 715e50af8739785e9d4db2567780075900711ff9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 4 Jan 2020 17:32:38 -0700 Subject: [PATCH 021/141] New version 2.1.0 (bz 1742638). Also: - Invoke the configure script (bz 1740196). - Add LGPLv2 to License due to incremental-cycles. - Add -emacs subpackage and byte compile the Emacs Lisp files. - Drop upstreamed 15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch. - Add -doc-emphasis and -doc-scheme patches. - Run the unit tests in %check. --- ...4b09a8c06871635d5fd98c3a37089bbde6d9.patch | 28 -- ocaml-dune-doc-emphasis.patch | 13 + ocaml-dune-doc-scheme.patch | 297 ++++++++++++++++++ ocaml-dune.rpmlintrc | 14 + ocaml-dune.spec | 190 ++++++----- 5 files changed, 439 insertions(+), 103 deletions(-) delete mode 100644 15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch create mode 100644 ocaml-dune-doc-emphasis.patch create mode 100644 ocaml-dune-doc-scheme.patch create mode 100644 ocaml-dune.rpmlintrc diff --git a/15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch b/15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch deleted file mode 100644 index 0c2ba1f..0000000 --- a/15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 15c04b09a8c06871635d5fd98c3a37089bbde6d9 Mon Sep 17 00:00:00 2001 -From: Jeremie Dimino -Date: Thu, 8 Aug 2019 23:31:27 +0100 -Subject: [PATCH] remove nodynlink optimisation - -Signed-off-by: Jeremie Dimino ---- - src/exe_rules.ml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/exe_rules.ml b/src/exe_rules.ml -index 834afab21..eda12ee4d 100644 ---- a/src/exe_rules.ml -+++ b/src/exe_rules.ml -@@ -104,11 +104,11 @@ let executables_rules ~sctx ~dir ~dir_kind ~expander - else - Some js_of_ocaml - in -- let dynlink = -+ let dynlink = true (* - Dune_file.Executables.Link_mode.Set.exists exes.modes ~f:(fun mode -> - match mode.kind with - | Shared_object -> true -- | _ -> false) -+ | _ -> false)*) - in - Compilation_context.create () - ~super_context:sctx diff --git a/ocaml-dune-doc-emphasis.patch b/ocaml-dune-doc-emphasis.patch new file mode 100644 index 0000000..f0148f7 --- /dev/null +++ b/ocaml-dune-doc-emphasis.patch @@ -0,0 +1,13 @@ +diff --git a/doc/caching.rst b/doc/caching.rst +index 60958630..6ccc20d7 100644 +--- a/doc/caching.rst ++++ b/doc/caching.rst +@@ -18,7 +18,7 @@ promoted to the cache, and subsequent builds will automatically check + the cache for hits. + + The cached files are stored inside you `XDG_CACHE_HOME` directory on +-*nix systems, and `"HOME\\Local Settings\\Cache"` on Windows. ++\*nix systems, and `"HOME\\Local Settings\\Cache"` on Windows. + + + Daemon diff --git a/ocaml-dune-doc-scheme.patch b/ocaml-dune-doc-scheme.patch new file mode 100644 index 0000000..69c70ac --- /dev/null +++ b/ocaml-dune-doc-scheme.patch @@ -0,0 +1,297 @@ +diff --git a/doc/advanced-topics.rst b/doc/advanced-topics.rst +index 7a90753d..26f826aa 100644 +--- a/doc/advanced-topics.rst ++++ b/doc/advanced-topics.rst +@@ -215,7 +215,7 @@ Below is an example where we build ``my.cmxs`` containing ``foo.cmxa`` and + ``d.cmx``. Note how we use a :ref:`library` stanza to set up the compilation of + ``d.cmx``. + +-.. code:: scheme ++.. code:: lisp + + (library + (name foo) +diff --git a/doc/concepts.rst b/doc/concepts.rst +index dd83ebb0..6cf67d46 100644 +--- a/doc/concepts.rst ++++ b/doc/concepts.rst +@@ -83,7 +83,7 @@ error. + Here's a simple example of a condition that expresses running on OSX and having + an flambda compiler with the help of variable expansion: + +-.. code:: scheme ++.. code:: lisp + + (and %{ocamlc-config:flambda} (= %{ocamlc-config:system} macosx)) + +@@ -247,7 +247,7 @@ Forms that expands to list of items, such as ``%{cc}``, ``%{deps}``, + ``%{targets}`` or ``%{read-lines:...}``, are suitable to be used in, say, + ``(run )``. For instance in: + +-.. code:: scheme ++.. code:: lisp + + (run foo %{deps}) + +@@ -275,7 +275,7 @@ which is equivalent to the following shell command: + Note that, since ``%{deps}`` is a list of items, the first one may be + used as a program name, for instance: + +-.. code:: scheme ++.. code:: lisp + + (rule + (targets result.txt) +@@ -284,7 +284,7 @@ used as a program name, for instance: + + Here is another example: + +-.. code:: scheme ++.. code:: lisp + + (rule + (target foo.exe) +@@ -400,7 +400,7 @@ be an action that reads the file given as only dependency named + More precisely, ``(preprocess (action ))`` acts as if + you had setup a rule for every file of the form: + +- .. code:: scheme ++ .. code:: lisp + + (rule + (target file.pp.ml) +@@ -456,7 +456,7 @@ names. + + For instance: + +- .. code:: scheme ++ .. code:: lisp + + (preprocess (per_module + (((action (run ./pp.sh X=1 %{input-file})) foo bar)) +@@ -537,7 +537,7 @@ in actions (like the ``%{deps}``, ``%{target}`` and ``%{targets}`` built in vari + One instance where this is useful is for naming globs. Here's an + example of an imaginary bundle command: + +-.. code:: scheme ++.. code:: lisp + + (rule + (target archive.tar) +@@ -696,7 +696,7 @@ Note: expansion of the special ``%{:...}`` is done relative to the current + working directory of the part of the DSL being executed. So for instance if you + have this action in a ``src/foo/dune``: + +-.. code:: scheme ++.. code:: lisp + + (action (chdir ../../.. (echo %{path:dune}))) + +@@ -831,7 +831,7 @@ complicated tests. In order to prevent dune from running the + actions at the same time, you can specify that both actions take the + same lock: + +-.. code:: scheme ++.. code:: lisp + + (rule + (alias runtest) +@@ -857,7 +857,7 @@ contexts setup, the same rule might still be executed concurrently between the + two build contexts. If you want a lock that is global to all build contexts, + simply use an absolute filename: + +-.. code:: scheme ++.. code:: lisp + + (rule + (alias runtest) +@@ -957,7 +957,7 @@ Declaring a package + To declare a package, simply add a ``package`` stanza to your + ``dune-project`` file: + +-.. code:: scheme ++.. code:: lisp + + (package + (name mypackage) +diff --git a/doc/cross-compilation.rst b/doc/cross-compilation.rst +index a4459caa..bc6189e2 100644 +--- a/doc/cross-compilation.rst ++++ b/doc/cross-compilation.rst +@@ -97,6 +97,6 @@ Some packages might still have to be updated to support cross-compilation. For + instance if the ``foo.exe`` program in the previous example was using + ``Sys.os_type``, it should instead take it as a command line argument: + +-.. code:: scheme ++.. code:: lisp + + (rule (with-stdout-to blah (run ./foo.exe -os-type %{os_type}))) +diff --git a/doc/dune-files.rst b/doc/dune-files.rst +index e8cba1ee..770b5c50 100644 +--- a/doc/dune-files.rst ++++ b/doc/dune-files.rst +@@ -277,7 +277,7 @@ The syntax of ``dune`` files is described in :ref:`metadata-format` section. + ``dune`` files are composed of stanzas. For instance a typical + ``dune`` looks like: + +-.. code:: scheme ++.. code:: lisp + + (library + (name mylib) +@@ -871,7 +871,7 @@ time obvious what are the dependencies and targets. + + For instance: + +-.. code:: scheme ++.. code:: lisp + + (rule + (target b) +@@ -897,7 +897,7 @@ Note that in dune, targets must always be known + statically. For instance, this ``(rule ...)`` + stanza is rejected by dune: + +-.. code:: scheme ++.. code:: lisp + + (rule (copy a b.%{read:file})) + +@@ -906,7 +906,7 @@ ocamllex + + ``(ocamllex )`` is essentially a shorthand for: + +-.. code:: scheme ++.. code:: lisp + + (rule + (target .ml) +@@ -929,7 +929,7 @@ ocamlyacc + + ``(ocamlyacc )`` is essentially a shorthand for: + +-.. code:: scheme ++.. code:: lisp + + (rule + (targets .ml .mli) +@@ -1074,7 +1074,7 @@ The syntax is as follows: + + The typical use of the ``alias`` stanza is to define tests: + +-.. code:: scheme ++.. code:: lisp + + (rule + (alias runtest) +@@ -1240,7 +1240,7 @@ be used to override the test binary invocation, for example if you're using + alcotest and wish to see all the test failures on the standard output when + running dune runtest you can use the following stanza: + +-.. code:: scheme ++.. code:: lisp + + (tests + (names mytest) +@@ -1324,7 +1324,7 @@ the user the following operations: + + Examples: + +-.. code:: scheme ++.. code:: lisp + + (dirs *) ;; include all directories + (dirs :standard \ ocaml) ;; include all directories except ocaml +@@ -1374,7 +1374,7 @@ All of the specified ```` will be ignored by dune. Note that users + should rely on the ``dirs`` stanza along with the appropriate set operations + instead of this stanza. For example: + +-.. code:: scheme ++.. code:: lisp + + (dirs :standard \ ...) + +@@ -1559,7 +1559,7 @@ writers avoid boilerplate we provide a `(coqpp ...)` stanza: + + which for each ``g_mod`` in ```` is equivalent to: + +-.. code:: scheme ++.. code:: lisp + + (rule + (targets g_mod.ml) +diff --git a/doc/migration.rst b/doc/migration.rst +index 0a905d26..e4249fc8 100644 +--- a/doc/migration.rst ++++ b/doc/migration.rst +@@ -191,7 +191,7 @@ Removed variables + A named dependency should be used instead of ``${<}``. For instance + the following jbuild file: + +-.. code:: scheme ++.. code:: lisp + + (alias + ((name runtest) +@@ -200,7 +200,7 @@ the following jbuild file: + + should be rewritten to the following dune file: + +-.. code:: scheme ++.. code:: lisp + + (rule + (alias runtest) +diff --git a/doc/quick-start.rst b/doc/quick-start.rst +index 5cbb12e4..18c61536 100644 +--- a/doc/quick-start.rst ++++ b/doc/quick-start.rst +@@ -134,7 +134,7 @@ Using cppo + + Add this field to your ``library`` or ``executable`` stanzas: + +-.. code:: scheme ++.. code:: lisp + + (preprocess (action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{input-file}))) + +@@ -150,7 +150,7 @@ Using the .cppo.ml style like the ocamlbuild plugin + + Write this in your ``dune`` file: + +-.. code:: scheme ++.. code:: lisp + + (rule + (targets foo.ml) +@@ -182,7 +182,7 @@ Defining a library with C stubs using pkg-config + Same context as before, but using ``pkg-config`` to query the + compilation and link flags. Write this ``dune`` file: + +-.. code:: scheme ++.. code:: lisp + + (library + (name mylib) +@@ -239,7 +239,7 @@ Using a custom code generator + + To generate a file ``foo.ml`` using a program from another directory: + +-.. code:: scheme ++.. code:: lisp + + (rule + (targets foo.ml) +diff --git a/doc/tests.rst b/doc/tests.rst +index 52d7902e..7931c8d1 100644 +--- a/doc/tests.rst ++++ b/doc/tests.rst +@@ -357,7 +357,7 @@ In this example, we put tests in comments of the form: + + The backend for such a framework looks like this: + +-.. code:: scheme ++.. code:: lisp + + (library + (name simple_tests) diff --git a/ocaml-dune.rpmlintrc b/ocaml-dune.rpmlintrc new file mode 100644 index 0000000..e72af52 --- /dev/null +++ b/ocaml-dune.rpmlintrc @@ -0,0 +1,14 @@ +# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON +# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors + +# The dictionary lacks some technical words +addFilter(r'W: spelling-error .* (composable|flymake)') + +# Caused by ocaml; this package cannot fix it +addFilter(r'ocaml-dune\.[^:]+: E: missing-call-to-chdir-with-chroot') + +# Documentation is in the main package +addFilter(r'ocaml-dune-.*\.[^:]+: W: no-documentation') + +# The configure script is not an autotools-generated script +addFilter(r'ocaml-dune\.spec:[^:]*: W: configure-without-libdir-spec') diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 5d3b7ff..b207373 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,30 +1,37 @@ -Name: ocaml-dune -Version: 1.11.0 -Release: 4%{?dist} +%global libname dune + +Name: ocaml-%{libname} +Version: 2.1.0 +Release: 1%{?dist} Summary: A composable build system for OCaml -%global libname %(echo %{name} | sed -e 's/^ocaml-//') - -# Dune itself is MIT, and there are bundled libs that are LGPLv2 with exceptions and ISC. -License: MIT and LGPLv2 with exceptions and ISC +# Dune itself is MIT. Some bundled libraries have a different license: +# ISC: +# - vendor/cmdliner +# LGPLv2: +# - vendor/incremental-cycles +# LGPLv2 with exceptions: +# - vendor/opam-file-format +# - vendor/re +License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz +# Fix an unescaped asterisk misinterpreted as emphasis start +# https://github.com/ocaml/dune/pull/2999 +Patch0: %{name}-doc-emphasis.patch +# Use the Lisp lexer instead of Scheme when nonstandard characters are used +# https://github.com/ocaml/dune/pull/3000 +Patch1: %{name}-doc-scheme.patch -# See: https://github.com/ocaml/dune/issues/2527 -Patch1: 15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch - -BuildRequires: ocaml >= 4.02.3 -BuildRequires: ocaml-findlib-devel - -# Depend on /usr/bin/sphinx-build for python version invariance. -BuildRequires: /usr/bin/sphinx-build -BuildRequires: python3-sphinx_rtd_theme +BuildRequires: emacs +BuildRequires: ocaml >= 4.07 +BuildRequires: ocaml-findlib +BuildRequires: python3dist(sphinx) +BuildRequires: python3dist(sphinx-rtd-theme) # Required by tests. -BuildRequires: git BuildRequires: ocaml-menhir -BuildRequires: ocaml-result-devel # Dune has vendored deps (ugh): # I'm not clear on how to unbundle them. @@ -32,7 +39,7 @@ BuildRequires: ocaml-result-devel # doesn't seem to be able to detect libraries installed systemwide. # https://github.com/ocaml/dune/issues/220 Provides: bundled(ocaml-opam-file-format) = 2.0.0 -Provides: bundled(ocaml-cmdliner) = 1.0.2 +Provides: bundled(ocaml-cmdliner) = 1.0.3 Provides: bundled(ocaml-re) = 1.7.1 Provides: dune = %{version}-%{release} @@ -68,95 +75,128 @@ BuildArch: noarch %description doc HTML documentation for dune, a composable build system for OCaml. +%package emacs +Summary: Emacs support for %{name} +License: ISC +Requires: %{name} = %{version}-%{release} + +BuildArch: noarch + +%description emacs +The %{name}-devel package contains Emacs integration with the dune build +system, a mode to edit dune files, and flymake support for dune files. + %prep -# Restore autosetup once we have fixed this upstream issue: -# https://github.com/ocaml/dune/issues/2527 -#autosetup -n %{libname}-%{version} -p1 -%setup -n %{libname}-%{version} -%ifarch %{arm} -%patch1 -p1 -%endif +%autosetup -n %{libname}-%{version} -p1 %build -# The dune build script figures out if the native code compiler is available -# and uses it if it is, otherwise it uses the bytecode compiler. Thus I think -# we just need to "make" here. -%make_build release +./configure --libdir %{_libdir}/ocaml --mandir %{_mandir} + +# This command fails, because ppx_bench, ppx_expect, and core_bench are missing. +# However, it is only tests that fail, not the actual build, so ignore the +# failures and continue. +%make_build || : +./dune.exe build @install %make_build doc +%ifarch %{ocaml_native_compiler} +# Relink the stublib. See https://github.com/ocaml/dune/issues/2977. +cd _build/default/src/stdune +ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o stdune_stubs fcntl_stubs.o +cd - +%endif + %install -# Dune's makefile has a "make install" target. Tragically, it uses opam-install(er) -# to install itself. Even more tragically, opam now requires dune to build. -# Therefore as a workaround we can just manually install things ourselves-- -# Dune is *mostly* just a binary, making this easy. -mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_mandir}/man1 -mkdir -p %{buildroot}%{_mandir}/man5 +# "make install" only installs the binary. We want the libraries, too. +./dune.exe install --destdir %{buildroot} -cp -av _boot/default/bin/main/main_dune.exe %{buildroot}%{_bindir}/dune -ln -sfvbn dune %{buildroot}%{_bindir}/jbuilder -cp -av _boot/default/doc/*.1 %{buildroot}%{_mandir}/man1/ -cp -av _boot/default/doc/*.5 %{buildroot}%{_mandir}/man5/ +%ifarch %{ocaml_native_compiler} +# Add missing executable bits +find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod 0755 {} \+ +%endif -# Dune also has libraries now, which need to be installed via the standard way. -mkdir -p %{buildroot}%{_libdir}/ocaml/%{libname}/ -cp -aLr _boot/install/default/lib/%{libname}/* %{buildroot}%{_libdir}/ocaml/%{libname}/ - -# Remove *.ml files from installation. -# This is a little annoying. ocaml/dune has a bunch of subdirectories that actually contain code. -# But the "_wp" subdirectory *itself* contains subdirectories with compiled code. -# So I've special-cased that one. -rm -fv %{buildroot}%{_libdir}/ocaml/%{libname}/*/*.ml -rm -fv %{buildroot}%{_libdir}/ocaml/%{libname}/_wp/*/*.ml +# Byte compile the Emacs files +cd %{buildroot}%{_emacs_sitelispdir} +%_emacs_bytecompile dune.el dune-flymake.el +cd - # Install documentation by way of pkgdocdir. +rm -fr %{buildroot}%{_prefix}/doc mkdir -p %{buildroot}%{_pkgdocdir}/ -cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/ +cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %check -# Do not run the unit tests which assume opam is installed. - -%{buildroot}%{_bindir}/dune --version +# These are the only tests we can run. The others require components that +# either depend on dune themselves or are not available in Fedora at all. +%{buildroot}%{_bindir}/dune runtest test/unit-tests %files %license LICENSE.md %doc %{_pkgdocdir}/README.md %doc %{_pkgdocdir}/CHANGES.md -%{_bindir}/jbuilder +%doc %{_pkgdocdir}/MIGRATION.md %{_bindir}/dune %{_mandir}/man*/dune* -%dir %{_pkgdocdir} -%{_libdir}/ocaml/%{libname} +%dir %{_pkgdocdir}/ +%dir %{_libdir}/ocaml/dune/ +%dir %{_libdir}/ocaml/dune-action-plugin/ +%dir %{_libdir}/ocaml/dune-build-info/ +%dir %{_libdir}/ocaml/dune-configurator/ +%dir %{_libdir}/ocaml/dune-glob/ +%dir %{_libdir}/ocaml/dune-private-libs/ +%dir %{_libdir}/ocaml/dune-private-libs/dune-lang/ +%dir %{_libdir}/ocaml/dune-private-libs/dune_re/ +%dir %{_libdir}/ocaml/dune-private-libs/ocaml-config/ +%dir %{_libdir}/ocaml/dune-private-libs/stdune/ +%{_libdir}/ocaml/dune*/META +%{_libdir}/ocaml/dune*/*.cma +%{_libdir}/ocaml/dune*/*.cmi +%{_libdir}/ocaml/dune-private-libs/*/*.cma +%{_libdir}/ocaml/dune-private-libs/*/*.cmi %ifarch %{ocaml_native_compiler} -%exclude %{_libdir}/ocaml/%{libname}/*/*.a -%exclude %{_libdir}/ocaml/%{libname}/*/*.cmxa -%exclude %{_libdir}/ocaml/%{libname}/*/*.cmx -%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.a -%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.cmxa -%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.cmx +%{_libdir}/ocaml/dune*/*.cmxs +%{_libdir}/ocaml/dune-private-libs/*/*.cmxs +%{_libdir}/ocaml/stublibs/dllstdune_stubs.so %endif -%exclude %{_libdir}/ocaml/%{libname}/*/*.mli -%exclude %{_libdir}/ocaml/%{libname}/_wp/*/*.mli %files devel +%{_libdir}/ocaml/dune*/dune-package +%{_libdir}/ocaml/dune*/opam +%{_libdir}/ocaml/dune*/*.cmt +%{_libdir}/ocaml/dune*/*.cmti +%{_libdir}/ocaml/dune*/*.ml +%{_libdir}/ocaml/dune*/*.mli +%{_libdir}/ocaml/dune-private-libs/*/*.cmt +%{_libdir}/ocaml/dune-private-libs/*/*.cmti +%{_libdir}/ocaml/dune-private-libs/*/*.ml +%{_libdir}/ocaml/dune-private-libs/*/*.mli %ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/%{libname}/*/*.a -%{_libdir}/ocaml/%{libname}/*/*.cmxa -%{_libdir}/ocaml/%{libname}/*/*.cmx -%{_libdir}/ocaml/%{libname}/_wp/*/*.a -%{_libdir}/ocaml/%{libname}/_wp/*/*.cmxa -%{_libdir}/ocaml/%{libname}/_wp/*/*.cmx +%{_libdir}/ocaml/dune*/*.a +%{_libdir}/ocaml/dune*/*.cmx +%{_libdir}/ocaml/dune*/*.cmxa +%{_libdir}/ocaml/dune-private-libs/*/*.a +%{_libdir}/ocaml/dune-private-libs/*/*.cmx +%{_libdir}/ocaml/dune-private-libs/*/*.cmxa %endif -%{_libdir}/ocaml/%{libname}/*/*.mli -# There do not seem to be headers in the _wp subdirectory. -#{_libdir}/ocaml/{libname}/_wp/*/*.mli %files doc %exclude %{_pkgdocdir}/README.md %exclude %{_pkgdocdir}/CHANGES.md %doc %{_pkgdocdir}/* +%files emacs +%{_emacs_sitelispdir}/dune* + %changelog +* Sat Jan 4 2020 Jerry James - 2.1.0-1 +- New version 2.1.0 (bz 1742638) +- Invoke the configure script (bz 1740196) +- Add LGPLv2 to License due to incremental-cycles +- Add -emacs subpackage and byte compile the Emacs Lisp files +- Drop upstreamed 15c04b09a8c06871635d5fd98c3a37089bbde6d9.patch +- Add -doc-emphasis and -doc-scheme patches +- Run the unit tests in %%check + * Fri Dec 06 2019 Richard W.M. Jones - 1.11.0-4 - OCaml 4.09.0 (final) rebuild. From 358fca60b371c435ff715ad0b084972a8bd6b009 Mon Sep 17 00:00:00 2001 From: Ben Rosser Date: Fri, 10 Jan 2020 15:28:35 -0500 Subject: [PATCH 022/141] Update sources file; upload dune 2.1.0. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 59e40b3..0b998ef 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /dune-1.9.3.tar.gz /dune-1.10.0.tar.gz /dune-1.11.0.tar.gz +/dune-2.1.0.tar.gz diff --git a/sources b/sources index 81a6271..35bbe63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-1.11.0.tar.gz) = 8c5133527b20c1728b6097b5ae78edf1f5650849787f1f0cd11b4eec620daa597778af6945664164624d5a2d80f4a1d25532c899ef391265ecaf1188ae57b769 +SHA512 (dune-2.1.0.tar.gz) = 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f From 849682db3e3e72525d6907c757f91fbda5a5596c Mon Sep 17 00:00:00 2001 From: Ben Rosser Date: Fri, 10 Jan 2020 15:56:54 -0500 Subject: [PATCH 023/141] Update to latest upstream release, 2.1.2. --- .gitignore | 1 + ocaml-dune-doc-emphasis.patch | 13 -- ocaml-dune-doc-scheme.patch | 297 ---------------------------------- ocaml-dune.spec | 12 +- sources | 2 +- 5 files changed, 7 insertions(+), 318 deletions(-) delete mode 100644 ocaml-dune-doc-emphasis.patch delete mode 100644 ocaml-dune-doc-scheme.patch diff --git a/.gitignore b/.gitignore index 0b998ef..9a3bc3b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /dune-1.10.0.tar.gz /dune-1.11.0.tar.gz /dune-2.1.0.tar.gz +/dune-2.1.2.tar.gz diff --git a/ocaml-dune-doc-emphasis.patch b/ocaml-dune-doc-emphasis.patch deleted file mode 100644 index f0148f7..0000000 --- a/ocaml-dune-doc-emphasis.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/doc/caching.rst b/doc/caching.rst -index 60958630..6ccc20d7 100644 ---- a/doc/caching.rst -+++ b/doc/caching.rst -@@ -18,7 +18,7 @@ promoted to the cache, and subsequent builds will automatically check - the cache for hits. - - The cached files are stored inside you `XDG_CACHE_HOME` directory on --*nix systems, and `"HOME\\Local Settings\\Cache"` on Windows. -+\*nix systems, and `"HOME\\Local Settings\\Cache"` on Windows. - - - Daemon diff --git a/ocaml-dune-doc-scheme.patch b/ocaml-dune-doc-scheme.patch deleted file mode 100644 index 69c70ac..0000000 --- a/ocaml-dune-doc-scheme.patch +++ /dev/null @@ -1,297 +0,0 @@ -diff --git a/doc/advanced-topics.rst b/doc/advanced-topics.rst -index 7a90753d..26f826aa 100644 ---- a/doc/advanced-topics.rst -+++ b/doc/advanced-topics.rst -@@ -215,7 +215,7 @@ Below is an example where we build ``my.cmxs`` containing ``foo.cmxa`` and - ``d.cmx``. Note how we use a :ref:`library` stanza to set up the compilation of - ``d.cmx``. - --.. code:: scheme -+.. code:: lisp - - (library - (name foo) -diff --git a/doc/concepts.rst b/doc/concepts.rst -index dd83ebb0..6cf67d46 100644 ---- a/doc/concepts.rst -+++ b/doc/concepts.rst -@@ -83,7 +83,7 @@ error. - Here's a simple example of a condition that expresses running on OSX and having - an flambda compiler with the help of variable expansion: - --.. code:: scheme -+.. code:: lisp - - (and %{ocamlc-config:flambda} (= %{ocamlc-config:system} macosx)) - -@@ -247,7 +247,7 @@ Forms that expands to list of items, such as ``%{cc}``, ``%{deps}``, - ``%{targets}`` or ``%{read-lines:...}``, are suitable to be used in, say, - ``(run )``. For instance in: - --.. code:: scheme -+.. code:: lisp - - (run foo %{deps}) - -@@ -275,7 +275,7 @@ which is equivalent to the following shell command: - Note that, since ``%{deps}`` is a list of items, the first one may be - used as a program name, for instance: - --.. code:: scheme -+.. code:: lisp - - (rule - (targets result.txt) -@@ -284,7 +284,7 @@ used as a program name, for instance: - - Here is another example: - --.. code:: scheme -+.. code:: lisp - - (rule - (target foo.exe) -@@ -400,7 +400,7 @@ be an action that reads the file given as only dependency named - More precisely, ``(preprocess (action ))`` acts as if - you had setup a rule for every file of the form: - -- .. code:: scheme -+ .. code:: lisp - - (rule - (target file.pp.ml) -@@ -456,7 +456,7 @@ names. - - For instance: - -- .. code:: scheme -+ .. code:: lisp - - (preprocess (per_module - (((action (run ./pp.sh X=1 %{input-file})) foo bar)) -@@ -537,7 +537,7 @@ in actions (like the ``%{deps}``, ``%{target}`` and ``%{targets}`` built in vari - One instance where this is useful is for naming globs. Here's an - example of an imaginary bundle command: - --.. code:: scheme -+.. code:: lisp - - (rule - (target archive.tar) -@@ -696,7 +696,7 @@ Note: expansion of the special ``%{:...}`` is done relative to the current - working directory of the part of the DSL being executed. So for instance if you - have this action in a ``src/foo/dune``: - --.. code:: scheme -+.. code:: lisp - - (action (chdir ../../.. (echo %{path:dune}))) - -@@ -831,7 +831,7 @@ complicated tests. In order to prevent dune from running the - actions at the same time, you can specify that both actions take the - same lock: - --.. code:: scheme -+.. code:: lisp - - (rule - (alias runtest) -@@ -857,7 +857,7 @@ contexts setup, the same rule might still be executed concurrently between the - two build contexts. If you want a lock that is global to all build contexts, - simply use an absolute filename: - --.. code:: scheme -+.. code:: lisp - - (rule - (alias runtest) -@@ -957,7 +957,7 @@ Declaring a package - To declare a package, simply add a ``package`` stanza to your - ``dune-project`` file: - --.. code:: scheme -+.. code:: lisp - - (package - (name mypackage) -diff --git a/doc/cross-compilation.rst b/doc/cross-compilation.rst -index a4459caa..bc6189e2 100644 ---- a/doc/cross-compilation.rst -+++ b/doc/cross-compilation.rst -@@ -97,6 +97,6 @@ Some packages might still have to be updated to support cross-compilation. For - instance if the ``foo.exe`` program in the previous example was using - ``Sys.os_type``, it should instead take it as a command line argument: - --.. code:: scheme -+.. code:: lisp - - (rule (with-stdout-to blah (run ./foo.exe -os-type %{os_type}))) -diff --git a/doc/dune-files.rst b/doc/dune-files.rst -index e8cba1ee..770b5c50 100644 ---- a/doc/dune-files.rst -+++ b/doc/dune-files.rst -@@ -277,7 +277,7 @@ The syntax of ``dune`` files is described in :ref:`metadata-format` section. - ``dune`` files are composed of stanzas. For instance a typical - ``dune`` looks like: - --.. code:: scheme -+.. code:: lisp - - (library - (name mylib) -@@ -871,7 +871,7 @@ time obvious what are the dependencies and targets. - - For instance: - --.. code:: scheme -+.. code:: lisp - - (rule - (target b) -@@ -897,7 +897,7 @@ Note that in dune, targets must always be known - statically. For instance, this ``(rule ...)`` - stanza is rejected by dune: - --.. code:: scheme -+.. code:: lisp - - (rule (copy a b.%{read:file})) - -@@ -906,7 +906,7 @@ ocamllex - - ``(ocamllex )`` is essentially a shorthand for: - --.. code:: scheme -+.. code:: lisp - - (rule - (target .ml) -@@ -929,7 +929,7 @@ ocamlyacc - - ``(ocamlyacc )`` is essentially a shorthand for: - --.. code:: scheme -+.. code:: lisp - - (rule - (targets .ml .mli) -@@ -1074,7 +1074,7 @@ The syntax is as follows: - - The typical use of the ``alias`` stanza is to define tests: - --.. code:: scheme -+.. code:: lisp - - (rule - (alias runtest) -@@ -1240,7 +1240,7 @@ be used to override the test binary invocation, for example if you're using - alcotest and wish to see all the test failures on the standard output when - running dune runtest you can use the following stanza: - --.. code:: scheme -+.. code:: lisp - - (tests - (names mytest) -@@ -1324,7 +1324,7 @@ the user the following operations: - - Examples: - --.. code:: scheme -+.. code:: lisp - - (dirs *) ;; include all directories - (dirs :standard \ ocaml) ;; include all directories except ocaml -@@ -1374,7 +1374,7 @@ All of the specified ```` will be ignored by dune. Note that users - should rely on the ``dirs`` stanza along with the appropriate set operations - instead of this stanza. For example: - --.. code:: scheme -+.. code:: lisp - - (dirs :standard \ ...) - -@@ -1559,7 +1559,7 @@ writers avoid boilerplate we provide a `(coqpp ...)` stanza: - - which for each ``g_mod`` in ```` is equivalent to: - --.. code:: scheme -+.. code:: lisp - - (rule - (targets g_mod.ml) -diff --git a/doc/migration.rst b/doc/migration.rst -index 0a905d26..e4249fc8 100644 ---- a/doc/migration.rst -+++ b/doc/migration.rst -@@ -191,7 +191,7 @@ Removed variables - A named dependency should be used instead of ``${<}``. For instance - the following jbuild file: - --.. code:: scheme -+.. code:: lisp - - (alias - ((name runtest) -@@ -200,7 +200,7 @@ the following jbuild file: - - should be rewritten to the following dune file: - --.. code:: scheme -+.. code:: lisp - - (rule - (alias runtest) -diff --git a/doc/quick-start.rst b/doc/quick-start.rst -index 5cbb12e4..18c61536 100644 ---- a/doc/quick-start.rst -+++ b/doc/quick-start.rst -@@ -134,7 +134,7 @@ Using cppo - - Add this field to your ``library`` or ``executable`` stanzas: - --.. code:: scheme -+.. code:: lisp - - (preprocess (action (run %{bin:cppo} -V OCAML:%{ocaml_version} %{input-file}))) - -@@ -150,7 +150,7 @@ Using the .cppo.ml style like the ocamlbuild plugin - - Write this in your ``dune`` file: - --.. code:: scheme -+.. code:: lisp - - (rule - (targets foo.ml) -@@ -182,7 +182,7 @@ Defining a library with C stubs using pkg-config - Same context as before, but using ``pkg-config`` to query the - compilation and link flags. Write this ``dune`` file: - --.. code:: scheme -+.. code:: lisp - - (library - (name mylib) -@@ -239,7 +239,7 @@ Using a custom code generator - - To generate a file ``foo.ml`` using a program from another directory: - --.. code:: scheme -+.. code:: lisp - - (rule - (targets foo.ml) -diff --git a/doc/tests.rst b/doc/tests.rst -index 52d7902e..7931c8d1 100644 ---- a/doc/tests.rst -+++ b/doc/tests.rst -@@ -357,7 +357,7 @@ In this example, we put tests in comments of the form: - - The backend for such a framework looks like this: - --.. code:: scheme -+.. code:: lisp - - (library - (name simple_tests) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index b207373..26f738b 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,7 +1,7 @@ %global libname dune Name: ocaml-%{libname} -Version: 2.1.0 +Version: 2.1.2 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -17,12 +17,6 @@ License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz -# Fix an unescaped asterisk misinterpreted as emphasis start -# https://github.com/ocaml/dune/pull/2999 -Patch0: %{name}-doc-emphasis.patch -# Use the Lisp lexer instead of Scheme when nonstandard characters are used -# https://github.com/ocaml/dune/pull/3000 -Patch1: %{name}-doc-scheme.patch BuildRequires: emacs BuildRequires: ocaml >= 4.07 @@ -188,6 +182,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Jan 10 2020 Ben Rosser - 2.1.2-1 +- Update to latest upstream release, 2.1.2. +- Remove doc patches (as they were accepted upstream). + * Sat Jan 4 2020 Jerry James - 2.1.0-1 - New version 2.1.0 (bz 1742638) - Invoke the configure script (bz 1740196) diff --git a/sources b/sources index 35bbe63..7366084 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.1.0.tar.gz) = 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f +SHA512 (dune-2.1.2.tar.gz) = ede9fe430ebe1404a6d39cdf8c45cb8b08864fbe2c988545b7fb5469dcc80df3edd3d96e32d761d1ddf7a7b4e06e4e804ccddf03d7fb4a6231a8c6b767e2eca1 From cb21dff8c8e0696c7cd8c6eb2bd2d92397691b6e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 19 Jan 2020 14:34:13 +0000 Subject: [PATCH 024/141] OCaml 4.10.0+beta1 rebuild. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 26f738b..2cc7616 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -2,7 +2,7 @@ Name: ocaml-%{libname} Version: 2.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -182,6 +182,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Sun Jan 19 2020 Richard W.M. Jones - 2.1.2-2 +- OCaml 4.10.0+beta1 rebuild. + * Fri Jan 10 2020 Ben Rosser - 2.1.2-1 - Update to latest upstream release, 2.1.2. - Remove doc patches (as they were accepted upstream). From 4744349aaa835469d67fb2680758eec52051fcd5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 19:34:12 +0000 Subject: [PATCH 025/141] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 2cc7616..ddf44cc 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -2,7 +2,7 @@ Name: ocaml-%{libname} Version: 2.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -182,6 +182,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sun Jan 19 2020 Richard W.M. Jones - 2.1.2-2 - OCaml 4.10.0+beta1 rebuild. From 0fa0d4878c8696db49c5de9f752f2f769af97c28 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 7 Feb 2020 10:27:36 -0700 Subject: [PATCH 026/141] New version 2.2.0 (bz 1742638) --- .gitignore | 11 +---------- ocaml-dune.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 9a3bc3b..95c76fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -/dune-1.7.3.tar.gz -/dune-1.8.0.tar.gz -/dune-1.8.2.tar.gz -/dune-1.9.0.tar.gz -/dune-1.9.1.tar.gz -/dune-1.9.3.tar.gz -/dune-1.10.0.tar.gz -/dune-1.11.0.tar.gz -/dune-2.1.0.tar.gz -/dune-2.1.2.tar.gz +/dune-*.tar.gz diff --git a/ocaml-dune.spec b/ocaml-dune.spec index ddf44cc..ac25d80 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,8 +1,8 @@ %global libname dune Name: ocaml-%{libname} -Version: 2.1.2 -Release: 3%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -89,7 +89,7 @@ system, a mode to edit dune files, and flymake support for dune files. # This command fails, because ppx_bench, ppx_expect, and core_bench are missing. # However, it is only tests that fail, not the actual build, so ignore the # failures and continue. -%make_build || : +%make_build release || : ./dune.exe build @install %make_build doc @@ -182,6 +182,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Feb 7 2020 Jerry James - 2.2.0-1 +- New version 2.2.0 (bz 1742638) + * Wed Jan 29 2020 Fedora Release Engineering - 2.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 7366084..6e8b429 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.1.2.tar.gz) = ede9fe430ebe1404a6d39cdf8c45cb8b08864fbe2c988545b7fb5469dcc80df3edd3d96e32d761d1ddf7a7b4e06e4e804ccddf03d7fb4a6231a8c6b767e2eca1 +SHA512 (dune-2.2.0.tar.gz) = 0c529cbfbaac99cdd644f7066ab68a739bd09b02a57b7ca83c2f3b706594d1f1b793e7ab3b86d9cd03512a308970a6733abb08ad74320014f0654f770f41742a From acad1c28363853d2f43fce54646c135b1deb2cfa Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 17 Feb 2020 21:30:57 -0700 Subject: [PATCH 027/141] New version 2.3.0 (bz 1803374). --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index ac25d80..90245d6 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,7 +1,7 @@ %global libname dune Name: ocaml-%{libname} -Version: 2.2.0 +Version: 2.3.0 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -182,6 +182,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Tue Feb 18 2020 Jerry James - 2.3.0-1 +- New version 2.3.0 (bz 1803374) + * Fri Feb 7 2020 Jerry James - 2.2.0-1 - New version 2.2.0 (bz 1742638) diff --git a/sources b/sources index 6e8b429..2293f78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.2.0.tar.gz) = 0c529cbfbaac99cdd644f7066ab68a739bd09b02a57b7ca83c2f3b706594d1f1b793e7ab3b86d9cd03512a308970a6733abb08ad74320014f0654f770f41742a +SHA512 (dune-2.3.0.tar.gz) = a9f0263d2db9c89270b176832b8151ed06495b0b4ef73a1c09371138b7c2362aead4227f15cdb943b870566b1d1e8c9436ee682cd6f0b1c8cafc87a0dfca1c1e From 384b7e5c5e7ca5ee39034aff7e2caeb9bb3b744a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 20 Feb 2020 20:56:10 -0700 Subject: [PATCH 028/141] New version 2.3.1 (bz 1805578). --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 90245d6..45e0263 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,7 +1,7 @@ %global libname dune Name: ocaml-%{libname} -Version: 2.3.0 +Version: 2.3.1 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -182,6 +182,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Feb 20 2020 Jerry James - 2.3.1-1 +- New version 2.3.1 (bz 1805578) + * Tue Feb 18 2020 Jerry James - 2.3.0-1 - New version 2.3.0 (bz 1803374) diff --git a/sources b/sources index 2293f78..c8c8d50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.3.0.tar.gz) = a9f0263d2db9c89270b176832b8151ed06495b0b4ef73a1c09371138b7c2362aead4227f15cdb943b870566b1d1e8c9436ee682cd6f0b1c8cafc87a0dfca1c1e +SHA512 (dune-2.3.1.tar.gz) = 2496731d8477e3d603b685616c5474ed704464cca822845c9eb623aa03d4b43caf454fc3d8b1f949360a96363450fb322e5f085305a209af7dc6b3f0f72e5ae0 From 114710af4f5d51acc41515eb50629a782f9761d3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 26 Feb 2020 11:23:10 +0000 Subject: [PATCH 029/141] OCaml 4.10.0 final. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 45e0263..6a6d48f 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -2,7 +2,7 @@ Name: ocaml-%{libname} Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -182,6 +182,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Wed Feb 26 2020 Richard W.M. Jones - 2.3.1-2 +- OCaml 4.10.0 final. + * Thu Feb 20 2020 Jerry James - 2.3.1-1 - New version 2.3.1 (bz 1805578) From 134b5e568d42d5a53b8ae0418da234a33650c11f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 6 Mar 2020 11:01:02 -0700 Subject: [PATCH 030/141] New version 2.4.0. Add bootstrap conditional for builds without ocaml-menhir. --- ocaml-dune.spec | 18 ++++++++++++++---- sources | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 6a6d48f..b6da0c0 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,8 +1,12 @@ %global libname dune +# Since menhir now requires dune to build, but dune needs menhir only for the +# tests, build in bootstrap mode to skip the tests and the need for menhir. +%bcond_with bootstrap + Name: ocaml-%{libname} -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -24,8 +28,10 @@ BuildRequires: ocaml-findlib BuildRequires: python3dist(sphinx) BuildRequires: python3dist(sphinx-rtd-theme) +%if %{without bootstrap} # Required by tests. BuildRequires: ocaml-menhir +%endif # Dune has vendored deps (ugh): # I'm not clear on how to unbundle them. @@ -93,12 +99,10 @@ system, a mode to edit dune files, and flymake support for dune files. ./dune.exe build @install %make_build doc -%ifarch %{ocaml_native_compiler} # Relink the stublib. See https://github.com/ocaml/dune/issues/2977. cd _build/default/src/stdune ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o stdune_stubs fcntl_stubs.o cd - -%endif %install # "make install" only installs the binary. We want the libraries, too. @@ -119,10 +123,12 @@ rm -fr %{buildroot}%{_prefix}/doc mkdir -p %{buildroot}%{_pkgdocdir}/ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ +%if %{without bootstrap} %check # These are the only tests we can run. The others require components that # either depend on dune themselves or are not available in Fedora at all. %{buildroot}%{_bindir}/dune runtest test/unit-tests +%endif %files %license LICENSE.md @@ -182,6 +188,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Mar 6 2020 Jerry James - 2.4.0-1 +- New version 2.4.0 +- Add bootstrap conditional for builds without ocaml-menhir + * Wed Feb 26 2020 Richard W.M. Jones - 2.3.1-2 - OCaml 4.10.0 final. diff --git a/sources b/sources index c8c8d50..6189d09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.3.1.tar.gz) = 2496731d8477e3d603b685616c5474ed704464cca822845c9eb623aa03d4b43caf454fc3d8b1f949360a96363450fb322e5f085305a209af7dc6b3f0f72e5ae0 +SHA512 (dune-2.4.0.tar.gz) = 4e8ecc422cd00b63aca95b9ce2ab16bad6e9ab53a5be991377c932ccaf117c974012ebaaacc6138f3b5b3154d395099c6828fb87b2ba096393db2d82d3f47fee From 4580e9dcebf48cd6d3dd5a717edd80b8877e508b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Apr 2020 23:08:03 +0100 Subject: [PATCH 031/141] Update all OCaml dependencies for RPM 4.16. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index b6da0c0..fd37cd8 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -188,6 +188,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Apr 02 2020 Richard W.M. Jones - 2.4.0-2 +- Update all OCaml dependencies for RPM 4.16. + * Fri Mar 6 2020 Jerry James - 2.4.0-1 - New version 2.4.0 - Add bootstrap conditional for builds without ocaml-menhir From 308383c7bd6f3d4128b960dd5a57c74c4351c0c2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 10 Apr 2020 10:37:25 -0600 Subject: [PATCH 032/141] Version 2.5.0 --- ocaml-dune.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index fd37cd8..adc9dd9 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_with bootstrap Name: ocaml-%{libname} -Version: 2.4.0 -Release: 2%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -38,6 +38,8 @@ BuildRequires: ocaml-menhir # It seems to be unsupported upstream; the bootstrap process for dune # doesn't seem to be able to detect libraries installed systemwide. # https://github.com/ocaml/dune/issues/220 +Provides: bundled(ocaml-build-path-prefix-map) = 0.2 +Provides: bundled(ocaml-csexp) = 1.0.0 Provides: bundled(ocaml-opam-file-format) = 2.0.0 Provides: bundled(ocaml-cmdliner) = 1.0.3 Provides: bundled(ocaml-re) = 1.7.1 @@ -188,6 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Apr 10 2020 Jerry James - 2.5.0-1 +- Version 2.5.0 + * Thu Apr 02 2020 Richard W.M. Jones - 2.4.0-2 - Update all OCaml dependencies for RPM 4.16. diff --git a/sources b/sources index 6189d09..dba12eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.4.0.tar.gz) = 4e8ecc422cd00b63aca95b9ce2ab16bad6e9ab53a5be991377c932ccaf117c974012ebaaacc6138f3b5b3154d395099c6828fb87b2ba096393db2d82d3f47fee +SHA512 (dune-2.5.0.tar.gz) = 26b0e8ad9f6b7b7a3da1779bef15d6c60ad36951c66140cb9b606e5a80c7286047a0c9e0fbc242d50d054f413a65b8b21a053c138b637abbe8880c7a98eb3f0d From f3e530b23b6bdfe11c14fc68b207fcc2b2f38f49 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Apr 2020 19:52:41 +0100 Subject: [PATCH 033/141] Disable menhir for OCaml bootstrap. --- ocaml-dune.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index adc9dd9..017f447 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -2,7 +2,7 @@ # Since menhir now requires dune to build, but dune needs menhir only for the # tests, build in bootstrap mode to skip the tests and the need for menhir. -%bcond_with bootstrap +%bcond_without bootstrap Name: ocaml-%{libname} Version: 2.5.0 From c4c3592b95116be1fff6957262e0a533edff2a61 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Apr 2020 21:22:43 +0100 Subject: [PATCH 034/141] OCaml 4.11.0 pre-release --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 017f447..bfda174 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -190,6 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Apr 17 2020 Richard W.M. Jones - 2.5.0-2 +- OCaml 4.11.0 pre-release + * Fri Apr 10 2020 Jerry James - 2.5.0-1 - Version 2.5.0 From afe805eb5addc8254f7b5122821106a55f3102b8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 17 Apr 2020 23:40:44 +0100 Subject: [PATCH 035/141] 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 bfda174..f544ccd 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -190,6 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Apr 17 2020 Richard W.M. Jones - 2.5.0-3 +- Bump release and rebuild. + * Fri Apr 17 2020 Richard W.M. Jones - 2.5.0-2 - OCaml 4.11.0 pre-release From 96f14a22704261936e3eeb5dd8b6465ae908eca5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Apr 2020 08:59:05 +0100 Subject: [PATCH 036/141] 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 f544ccd..5597756 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -190,6 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Sat Apr 18 2020 Richard W.M. Jones - 2.5.0-4 +- Bump release and rebuild. + * Fri Apr 17 2020 Richard W.M. Jones - 2.5.0-3 - Bump release and rebuild. From 9630564026b47bba7c5f450c98b827f5e3e935d2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Apr 2020 10:37:49 +0100 Subject: [PATCH 037/141] 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 5597756..55bd2cc 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -190,6 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Sat Apr 18 2020 Richard W.M. Jones - 2.5.0-5 +- Bump release and rebuild. + * Sat Apr 18 2020 Richard W.M. Jones - 2.5.0-4 - Bump release and rebuild. From 672b2ed9cdfe7a5af46407b8d10c522a179f6fc1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 19 Apr 2020 21:52:43 -0600 Subject: [PATCH 038/141] New version 2.5.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 55bd2cc..c8365f7 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without bootstrap Name: ocaml-%{libname} -Version: 2.5.0 -Release: 5%{?dist} +Version: 2.5.1 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -190,6 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Sun Apr 19 2020 Jerry James - 2.5.1-1 +- New version 2.5.1 + * Sat Apr 18 2020 Richard W.M. Jones - 2.5.0-5 - Bump release and rebuild. diff --git a/sources b/sources index dba12eb..eecea30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.5.0.tar.gz) = 26b0e8ad9f6b7b7a3da1779bef15d6c60ad36951c66140cb9b606e5a80c7286047a0c9e0fbc242d50d054f413a65b8b21a053c138b637abbe8880c7a98eb3f0d +SHA512 (dune-2.5.1.tar.gz) = d7d3df74c33ef9b2d1fb95c3150e91056b69aefbad44542bd4af3ef310038a3b083fb178065ec0fbb5eb3dd564578d04d37944ec022fb92fe5d437a6ca7ec3fa From 16bb386c9392743f9443738aa562cc1c0dda883c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 Apr 2020 16:48:44 +0100 Subject: [PATCH 039/141] OCaml 4.11.0 pre-release attempt 2 --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index c8365f7..92ee838 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -190,6 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Tue Apr 21 2020 Richard W.M. Jones - 2.5.1-2 +- OCaml 4.11.0 pre-release attempt 2 + * Sun Apr 19 2020 Jerry James - 2.5.1-1 - New version 2.5.1 From e06e5d86e1385ba91a1a953d0f521b24a17d63bb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 21 Apr 2020 17:17:21 +0100 Subject: [PATCH 040/141] Rename cond "bootstrap" as "menhir". The reason for this is that it causes the final package to be named ocaml-dune-2.5.1-2.fc33~bootstrap. This breaks build automation since fedpkg verrel returns the name without the ~bootstrap appendage. --- ocaml-dune.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 92ee838..4d02316 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -2,11 +2,11 @@ # Since menhir now requires dune to build, but dune needs menhir only for the # tests, build in bootstrap mode to skip the tests and the need for menhir. -%bcond_without bootstrap +%bcond_without menhir Name: ocaml-%{libname} Version: 2.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -28,7 +28,7 @@ BuildRequires: ocaml-findlib BuildRequires: python3dist(sphinx) BuildRequires: python3dist(sphinx-rtd-theme) -%if %{without bootstrap} +%if %{without menhir} # Required by tests. BuildRequires: ocaml-menhir %endif @@ -125,7 +125,7 @@ rm -fr %{buildroot}%{_prefix}/doc mkdir -p %{buildroot}%{_pkgdocdir}/ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ -%if %{without bootstrap} +%if %{without menhir} %check # These are the only tests we can run. The others require components that # either depend on dune themselves or are not available in Fedora at all. @@ -190,8 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog -* Tue Apr 21 2020 Richard W.M. Jones - 2.5.1-2 +* Tue Apr 21 2020 Richard W.M. Jones - 2.5.1-3 - OCaml 4.11.0 pre-release attempt 2 +- Rename cond "bootstrap" as "menhir". * Sun Apr 19 2020 Jerry James - 2.5.1-1 - New version 2.5.1 From 69d59c02f757270976778ae2aad4c219fc365aa0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 May 2020 23:06:51 +0100 Subject: [PATCH 041/141] OCaml 4.11.0+dev2-2020-04-22 rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 4d02316..6e05510 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -190,6 +190,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon May 04 2020 Richard W.M. Jones - 2.5.1-4 +- OCaml 4.11.0+dev2-2020-04-22 rebuild + * Tue Apr 21 2020 Richard W.M. Jones - 2.5.1-3 - OCaml 4.11.0 pre-release attempt 2 - Rename cond "bootstrap" as "menhir". From 1a90f14efcdcb601ef28646c580325186dd09a01 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 6 Jun 2020 15:56:09 -0600 Subject: [PATCH 042/141] New version 2.6.0. --- ocaml-dune.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 6e05510..7d0b03c 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.5.1 -Release: 4%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -153,6 +153,7 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_libdir}/ocaml/dune*/META %{_libdir}/ocaml/dune*/*.cma %{_libdir}/ocaml/dune*/*.cmi +%{_libdir}/ocaml/dune-configurator/.private/ %{_libdir}/ocaml/dune-private-libs/*/*.cma %{_libdir}/ocaml/dune-private-libs/*/*.cmi %ifarch %{ocaml_native_compiler} @@ -190,6 +191,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Sat Jun 6 2020 Jerry James - 2.6.0-1 +- New version 2.6.0 + * Mon May 04 2020 Richard W.M. Jones - 2.5.1-4 - OCaml 4.11.0+dev2-2020-04-22 rebuild diff --git a/sources b/sources index eecea30..5703916 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.5.1.tar.gz) = d7d3df74c33ef9b2d1fb95c3150e91056b69aefbad44542bd4af3ef310038a3b083fb178065ec0fbb5eb3dd564578d04d37944ec022fb92fe5d437a6ca7ec3fa +SHA512 (dune-2.6.0.tar.gz) = 3bead36c02e061737c05ac84e23b33d38a43477048b4199eb1205a7345fc83fd6ae1ac1d0a052d1ff276eb64fc67425a4e951e7a9d26795dccaf8f87041460ef From 3c27d8efa9fcc4499f6e3069cdab50418a0a998e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 2 Jul 2020 16:46:41 -0600 Subject: [PATCH 043/141] New version 2.6.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 7d0b03c..71b7e4f 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,7 +5,7 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -191,6 +191,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Jul 2 2020 Jerry James - 2.6.1-1 +- New version 2.6.1 + * Sat Jun 6 2020 Jerry James - 2.6.0-1 - New version 2.6.0 diff --git a/sources b/sources index 5703916..010b966 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.6.0.tar.gz) = 3bead36c02e061737c05ac84e23b33d38a43477048b4199eb1205a7345fc83fd6ae1ac1d0a052d1ff276eb64fc67425a4e951e7a9d26795dccaf8f87041460ef +SHA512 (dune-2.6.1.tar.gz) = 6e988016cb701b9294330aecaec9214ea4fdafe9af9c433e326284bc42fe019eaa5006a5987e29451d831a47cd8f9596b6d9562478e2d73b98e4c57d0691c3ec From 89ee7a420cf1b3fc802210379b107ca1dbb6c656 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 12:08:50 +0000 Subject: [PATCH 044/141] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 71b7e4f..efad5a6 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -191,6 +191,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 2 2020 Jerry James - 2.6.1-1 - New version 2.6.1 From 80e921d9014e53dbdfcacd02753f528dccddaf1f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 3 Aug 2020 15:49:44 -0600 Subject: [PATCH 045/141] New version 2.6.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 efad5a6..e32e07a 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.6.1 -Release: 2%{?dist} +Version: 2.6.2 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -191,6 +191,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Aug 3 2020 Jerry James - 2.6.2-1 +- New version 2.6.2 + * Tue Jul 28 2020 Fedora Release Engineering - 2.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 010b966..a54c4ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.6.1.tar.gz) = 6e988016cb701b9294330aecaec9214ea4fdafe9af9c433e326284bc42fe019eaa5006a5987e29451d831a47cd8f9596b6d9562478e2d73b98e4c57d0691c3ec +SHA512 (dune-2.6.2.tar.gz) = 34993daaf10b2f4e897b56d60bd329472f80cec58c61348b086974d17f195946f16d5e767a0ee85f0a59e86a26ca9b3ea56ae81e8072442fbc041457bc9afed0 From 5a43ac7e129278e4e5af85d7c922a42492d843f6 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 4 Aug 2020 09:07:07 +0100 Subject: [PATCH 046/141] Pass -g option when compiling ppx extensions. https://github.com/ocaml/dune/pull/3671 --- 3671.patch | 38 ++++++++++++++++++++++++++++++++++++++ ocaml-dune.spec | 10 +++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 3671.patch diff --git a/3671.patch b/3671.patch new file mode 100644 index 0000000..2361301 --- /dev/null +++ b/3671.patch @@ -0,0 +1,38 @@ +From a176b0ce6d6be0cdd6c7b04c3d655cae567527e2 Mon Sep 17 00:00:00 2001 +From: Rudi Grinberg +Date: Tue, 4 Aug 2020 00:56:34 -0700 +Subject: [PATCH] Pass -g when compiling ppx preprocessor + +Signed-off-by: Rudi Grinberg +--- + CHANGES.md | 2 ++ + src/dune/preprocessing.ml | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/CHANGES.md b/CHANGES.md +index 3bb8c04160..f195d7ca45 100644 +--- a/CHANGES.md ++++ b/CHANGES.md +@@ -76,6 +76,8 @@ next + - Fix a stack overflow when displaying large outputs (including diffs) (#3537, + fixes #2767, #3490, @emillon) + ++- Pass `-g` when compiling ppx preprocessors (#3671, @rgrinberg) ++ + 2.6.0 (05/06/2020) + ------------------ + +diff --git a/src/dune/preprocessing.ml b/src/dune/preprocessing.ml +index 87c765256c..53a391448b 100644 +--- a/src/dune/preprocessing.ml ++++ b/src/dune/preprocessing.ml +@@ -332,7 +332,8 @@ let build_ppx_driver sctx ~dep_kind ~target ~pps ~pp_names = + (Build.record_lib_deps + (Lib_deps.info ~kind:dep_kind (Lib_deps.of_pps pp_names))) + >>> Command.run compiler ~dir:(Path.build ctx.build_dir) +- [ A "-o" ++ [ A "-g" ++ ; A "-o" + ; Target target + ; A "-w" + ; A "-24" diff --git a/ocaml-dune.spec b/ocaml-dune.spec index e32e07a..7223d72 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -22,6 +22,10 @@ License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz +# Pass -g when compiling ppx extensions. +# https://github.com/ocaml/dune/pull/3671 +Patch1: 3671.patch + BuildRequires: emacs BuildRequires: ocaml >= 4.07 BuildRequires: ocaml-findlib @@ -191,6 +195,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Tue Aug 4 2020 Richard W.M. Jones - 2.6.2-2 +- Pass -g option when compiling ppx extensions. + https://github.com/ocaml/dune/pull/3671 + * Mon Aug 3 2020 Jerry James - 2.6.2-1 - New version 2.6.2 From ce5c02c2a0bbca20a3bfc478d442e05a2457a74f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 14 Aug 2020 13:45:23 -0600 Subject: [PATCH 047/141] Version 2.7.0. Drop upstreamed patch for issue 3671. --- 3671.patch | 38 -------------------------------------- ocaml-dune.spec | 18 +++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 48 deletions(-) delete mode 100644 3671.patch diff --git a/3671.patch b/3671.patch deleted file mode 100644 index 2361301..0000000 --- a/3671.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a176b0ce6d6be0cdd6c7b04c3d655cae567527e2 Mon Sep 17 00:00:00 2001 -From: Rudi Grinberg -Date: Tue, 4 Aug 2020 00:56:34 -0700 -Subject: [PATCH] Pass -g when compiling ppx preprocessor - -Signed-off-by: Rudi Grinberg ---- - CHANGES.md | 2 ++ - src/dune/preprocessing.ml | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CHANGES.md b/CHANGES.md -index 3bb8c04160..f195d7ca45 100644 ---- a/CHANGES.md -+++ b/CHANGES.md -@@ -76,6 +76,8 @@ next - - Fix a stack overflow when displaying large outputs (including diffs) (#3537, - fixes #2767, #3490, @emillon) - -+- Pass `-g` when compiling ppx preprocessors (#3671, @rgrinberg) -+ - 2.6.0 (05/06/2020) - ------------------ - -diff --git a/src/dune/preprocessing.ml b/src/dune/preprocessing.ml -index 87c765256c..53a391448b 100644 ---- a/src/dune/preprocessing.ml -+++ b/src/dune/preprocessing.ml -@@ -332,7 +332,8 @@ let build_ppx_driver sctx ~dep_kind ~target ~pps ~pp_names = - (Build.record_lib_deps - (Lib_deps.info ~kind:dep_kind (Lib_deps.of_pps pp_names))) - >>> Command.run compiler ~dir:(Path.build ctx.build_dir) -- [ A "-o" -+ [ A "-g" -+ ; A "-o" - ; Target target - ; A "-w" - ; A "-24" diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 7223d72..2cc1874 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.6.2 -Release: 2%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -22,15 +22,11 @@ License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz -# Pass -g when compiling ppx extensions. -# https://github.com/ocaml/dune/pull/3671 -Patch1: 3671.patch - BuildRequires: emacs -BuildRequires: ocaml >= 4.07 +BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-findlib -BuildRequires: python3dist(sphinx) -BuildRequires: python3dist(sphinx-rtd-theme) +BuildRequires: %{py3_dist sphinx} +BuildRequires: %{py3_dist sphinx-rtd-theme} %if %{without menhir} # Required by tests. @@ -195,6 +191,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Aug 14 2020 Jerry James - 2.7.0-1 +- Version 2.7.0 +- Drop upstreamed patch for issue 3671 + * Tue Aug 4 2020 Richard W.M. Jones - 2.6.2-2 - Pass -g option when compiling ppx extensions. https://github.com/ocaml/dune/pull/3671 diff --git a/sources b/sources index a54c4ae..c26d54c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.6.2.tar.gz) = 34993daaf10b2f4e897b56d60bd329472f80cec58c61348b086974d17f195946f16d5e767a0ee85f0a59e86a26ca9b3ea56ae81e8072442fbc041457bc9afed0 +SHA512 (dune-2.7.0.tar.gz) = 6063010f7e9d34846df878d94d12517e88a376ab67372ceac9411f4a83ba6eeaf487b8809c1fcc150e0d150ce8f7b925438780920c1883aee4ea242653b4cdb8 From 5203fad76752f2fd56df7bb6684a74f3704f0f75 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 21 Aug 2020 11:59:58 +0100 Subject: [PATCH 048/141] OCaml 4.11.0 rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 2cc1874..ed51cb3 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -191,6 +191,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Aug 21 2020 Richard W.M. Jones - 2.7.0-2 +- OCaml 4.11.0 rebuild + * Fri Aug 14 2020 Jerry James - 2.7.0-1 - Version 2.7.0 - Drop upstreamed patch for issue 3671 From e699447e52e618c187b9615190df733e3f26c853 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 24 Aug 2020 08:38:29 +0100 Subject: [PATCH 049/141] Add fix for https://github.com/ocaml/dune/issues/3736 --- 3739.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ ocaml-dune.spec | 9 ++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 3739.patch diff --git a/3739.patch b/3739.patch new file mode 100644 index 0000000..55e47d1 --- /dev/null +++ b/3739.patch @@ -0,0 +1,45 @@ +From 4a1fee49b97e7bd4da368c83c5a28cdbde9e140d Mon Sep 17 00:00:00 2001 +From: Rudi Grinberg +Date: Sat, 22 Aug 2020 20:56:56 -0700 +Subject: [PATCH] [configurator] more flexible #define parsing + +Allow duplicate values for the same key as long as they are the same. + +Signed-off-by: Rudi Grinberg +--- + otherlibs/configurator/src/v1.ml | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) + +diff --git a/otherlibs/configurator/src/v1.ml b/otherlibs/configurator/src/v1.ml +index 1cdc5c5672..721c0e7384 100644 +--- a/otherlibs/configurator/src/v1.ml ++++ b/otherlibs/configurator/src/v1.ml +@@ -532,13 +532,26 @@ const char *s%i = "BEGIN-%i-false-END"; + let extract_values obj_file vars = + let values = + Io.with_lexbuf_from_file obj_file ~f:(Extract_obj.extract []) +- |> Int.Map.of_list_exn ++ |> List.fold_left ~init:Int.Map.empty ~f:(fun acc (key, v) -> ++ Int.Map.update acc ~key ~f:(function ++ | None -> Some (Ok v) ++ | Some (Error vs) -> Some (Error (v :: vs)) ++ | Some (Ok v') -> ++ Some ++ ( if v = v' then ++ Ok v' ++ else ++ Error [ v; v' ] ))) + in + List.mapi vars ~f:(fun i (name, t) -> + let raw_val = + match Int.Map.find values i with + | None -> die "Unable to get value for %s" name +- | Some v -> v ++ | Some (Ok v) -> v ++ | Some (Error vs) -> ++ let vs = List.sort_uniq ~cmp:compare vs in ++ die "Duplicate values for %s:\n%s" name ++ (vs |> List.map ~f:(sprintf "- %s") |> String.concat ~sep:"\n") + in + let value = + match t with diff --git a/ocaml-dune.spec b/ocaml-dune.spec index ed51cb3..a028aae 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -22,6 +22,10 @@ License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz +# https://github.com/ocaml/dune/issues/3736 +# https://github.com/ocaml/dune/pull/3739 +Patch1: 3739.patch + BuildRequires: emacs BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-findlib @@ -191,6 +195,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Aug 24 2020 Richard W.M. Jones - 2.7.0-3 +- Add fix for https://github.com/ocaml/dune/issues/3736 + * Fri Aug 21 2020 Richard W.M. Jones - 2.7.0-2 - OCaml 4.11.0 rebuild From 12c4bb55a5f07a342c6036e0ec1a90d74c8a15d8 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 24 Aug 2020 10:48:48 +0100 Subject: [PATCH 050/141] Further fix for https://github.com/ocaml/dune/issues/3736 --- ...d729b97db408022995f93b19678706a79ca7.patch | 83 +++++++++++++++++++ ocaml-dune.spec | 5 +- 2 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 1a9bd729b97db408022995f93b19678706a79ca7.patch diff --git a/1a9bd729b97db408022995f93b19678706a79ca7.patch b/1a9bd729b97db408022995f93b19678706a79ca7.patch new file mode 100644 index 0000000..6cb6983 --- /dev/null +++ b/1a9bd729b97db408022995f93b19678706a79ca7.patch @@ -0,0 +1,83 @@ +From 1a9bd729b97db408022995f93b19678706a79ca7 Mon Sep 17 00:00:00 2001 +From: Rudi Grinberg +Date: Mon, 24 Aug 2020 02:39:59 -0700 +Subject: [PATCH] [configurator] more workaround for extracting #define + +allow duplicate values if they are the same _after_ conversion + +Signed-off-by: Rudi Grinberg +--- + otherlibs/configurator/src/v1.ml | 46 ++++++++++++++++++-------------- + 1 file changed, 26 insertions(+), 20 deletions(-) + +diff --git a/otherlibs/configurator/src/v1.ml b/otherlibs/configurator/src/v1.ml +index 721c0e7384..7e5dc19883 100644 +--- a/otherlibs/configurator/src/v1.ml ++++ b/otherlibs/configurator/src/v1.ml +@@ -466,10 +466,6 @@ module C_define = struct + | Switch of bool + | Int of int + | String of string +- +- let switch b = Switch b +- +- let int i = Int i + end + + let extract_program ?prelude includes vars = +@@ -544,29 +540,39 @@ const char *s%i = "BEGIN-%i-false-END"; + Error [ v; v' ] ))) + in + List.mapi vars ~f:(fun i (name, t) -> +- let raw_val = ++ let raw_vals = + match Int.Map.find values i with ++ | Some (Ok v) -> [ v ] ++ | Some (Error vs) -> vs + | None -> die "Unable to get value for %s" name +- | Some (Ok v) -> v +- | Some (Error vs) -> +- let vs = List.sort_uniq ~cmp:compare vs in ++ in ++ let parse_val_or_exn f = ++ let f x = ++ match f x with ++ | Some s -> s ++ | None -> ++ die ++ "Unable to read variable %S of type %s. Invalid value %S in %s \ ++ found" ++ name (Type.name t) x obj_file ++ in ++ let vs = ++ List.map ~f:(fun x -> (x, f x)) raw_vals ++ |> List.sort_uniq ~cmp:(fun (_, x) (_, y) -> compare x y) ++ in ++ match vs with ++ | [] -> assert false ++ | [ (_, v) ] -> v ++ | vs -> ++ let vs = List.map ~f:fst vs in + die "Duplicate values for %s:\n%s" name + (vs |> List.map ~f:(sprintf "- %s") |> String.concat ~sep:"\n") + in + let value = + match t with +- | Type.Switch -> Bool.of_string raw_val |> Option.map ~f:Value.switch +- | Int -> Int.of_string raw_val |> Option.map ~f:Value.int +- | String -> Some (String raw_val) +- in +- let value = +- match value with +- | Some v -> v +- | None -> +- die +- "Unable to read variable %S of type %s. Invalid value %S in %s \ +- found" +- name (Type.name t) raw_val obj_file ++ | Type.Switch -> Value.Switch (parse_val_or_exn Bool.of_string) ++ | Int -> Value.Int (parse_val_or_exn Int.of_string) ++ | String -> String (parse_val_or_exn (fun x -> Some x)) + in + (name, value)) + diff --git a/ocaml-dune.spec b/ocaml-dune.spec index a028aae..4514533 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.7.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -25,6 +25,7 @@ Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname # https://github.com/ocaml/dune/issues/3736 # https://github.com/ocaml/dune/pull/3739 Patch1: 3739.patch +Patch2: 1a9bd729b97db408022995f93b19678706a79ca7.patch BuildRequires: emacs BuildRequires: ocaml >= 4.08 @@ -195,7 +196,7 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog -* Mon Aug 24 2020 Richard W.M. Jones - 2.7.0-3 +* Mon Aug 24 2020 Richard W.M. Jones - 2.7.0-5 - Add fix for https://github.com/ocaml/dune/issues/3736 * Fri Aug 21 2020 Richard W.M. Jones - 2.7.0-2 From 92351ab8b4295e7160419da4c7065d04ae10ace2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 1 Sep 2020 20:06:35 +0100 Subject: [PATCH 051/141] OCaml 4.11.1 rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 4514533..748b8fe 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -196,6 +196,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Tue Sep 01 2020 Richard W.M. Jones - 2.7.0-6 +- OCaml 4.11.1 rebuild + * Mon Aug 24 2020 Richard W.M. Jones - 2.7.0-5 - Add fix for https://github.com/ocaml/dune/issues/3736 From 33574a9cc8eb2f0610f720ff66a3b21a09ad3c80 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 14 Sep 2020 15:07:32 -0600 Subject: [PATCH 052/141] Version 2.7.1. - Csexp is no longer vendored in. - Drop upstreamed patches for issue 3736 and pull request 3739. - Fix configuration with patch from pull request 3757. --- ...d729b97db408022995f93b19678706a79ca7.patch | 83 ------------------- 3739.patch | 45 ---------- ...697c9f6cd5848d2083faa84836b7dd8fbd4b.patch | 42 ++++++++++ ocaml-dune.spec | 19 +++-- sources | 2 +- 5 files changed, 55 insertions(+), 136 deletions(-) delete mode 100644 1a9bd729b97db408022995f93b19678706a79ca7.patch delete mode 100644 3739.patch create mode 100644 9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch diff --git a/1a9bd729b97db408022995f93b19678706a79ca7.patch b/1a9bd729b97db408022995f93b19678706a79ca7.patch deleted file mode 100644 index 6cb6983..0000000 --- a/1a9bd729b97db408022995f93b19678706a79ca7.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 1a9bd729b97db408022995f93b19678706a79ca7 Mon Sep 17 00:00:00 2001 -From: Rudi Grinberg -Date: Mon, 24 Aug 2020 02:39:59 -0700 -Subject: [PATCH] [configurator] more workaround for extracting #define - -allow duplicate values if they are the same _after_ conversion - -Signed-off-by: Rudi Grinberg ---- - otherlibs/configurator/src/v1.ml | 46 ++++++++++++++++++-------------- - 1 file changed, 26 insertions(+), 20 deletions(-) - -diff --git a/otherlibs/configurator/src/v1.ml b/otherlibs/configurator/src/v1.ml -index 721c0e7384..7e5dc19883 100644 ---- a/otherlibs/configurator/src/v1.ml -+++ b/otherlibs/configurator/src/v1.ml -@@ -466,10 +466,6 @@ module C_define = struct - | Switch of bool - | Int of int - | String of string -- -- let switch b = Switch b -- -- let int i = Int i - end - - let extract_program ?prelude includes vars = -@@ -544,29 +540,39 @@ const char *s%i = "BEGIN-%i-false-END"; - Error [ v; v' ] ))) - in - List.mapi vars ~f:(fun i (name, t) -> -- let raw_val = -+ let raw_vals = - match Int.Map.find values i with -+ | Some (Ok v) -> [ v ] -+ | Some (Error vs) -> vs - | None -> die "Unable to get value for %s" name -- | Some (Ok v) -> v -- | Some (Error vs) -> -- let vs = List.sort_uniq ~cmp:compare vs in -+ in -+ let parse_val_or_exn f = -+ let f x = -+ match f x with -+ | Some s -> s -+ | None -> -+ die -+ "Unable to read variable %S of type %s. Invalid value %S in %s \ -+ found" -+ name (Type.name t) x obj_file -+ in -+ let vs = -+ List.map ~f:(fun x -> (x, f x)) raw_vals -+ |> List.sort_uniq ~cmp:(fun (_, x) (_, y) -> compare x y) -+ in -+ match vs with -+ | [] -> assert false -+ | [ (_, v) ] -> v -+ | vs -> -+ let vs = List.map ~f:fst vs in - die "Duplicate values for %s:\n%s" name - (vs |> List.map ~f:(sprintf "- %s") |> String.concat ~sep:"\n") - in - let value = - match t with -- | Type.Switch -> Bool.of_string raw_val |> Option.map ~f:Value.switch -- | Int -> Int.of_string raw_val |> Option.map ~f:Value.int -- | String -> Some (String raw_val) -- in -- let value = -- match value with -- | Some v -> v -- | None -> -- die -- "Unable to read variable %S of type %s. Invalid value %S in %s \ -- found" -- name (Type.name t) raw_val obj_file -+ | Type.Switch -> Value.Switch (parse_val_or_exn Bool.of_string) -+ | Int -> Value.Int (parse_val_or_exn Int.of_string) -+ | String -> String (parse_val_or_exn (fun x -> Some x)) - in - (name, value)) - diff --git a/3739.patch b/3739.patch deleted file mode 100644 index 55e47d1..0000000 --- a/3739.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4a1fee49b97e7bd4da368c83c5a28cdbde9e140d Mon Sep 17 00:00:00 2001 -From: Rudi Grinberg -Date: Sat, 22 Aug 2020 20:56:56 -0700 -Subject: [PATCH] [configurator] more flexible #define parsing - -Allow duplicate values for the same key as long as they are the same. - -Signed-off-by: Rudi Grinberg ---- - otherlibs/configurator/src/v1.ml | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/otherlibs/configurator/src/v1.ml b/otherlibs/configurator/src/v1.ml -index 1cdc5c5672..721c0e7384 100644 ---- a/otherlibs/configurator/src/v1.ml -+++ b/otherlibs/configurator/src/v1.ml -@@ -532,13 +532,26 @@ const char *s%i = "BEGIN-%i-false-END"; - let extract_values obj_file vars = - let values = - Io.with_lexbuf_from_file obj_file ~f:(Extract_obj.extract []) -- |> Int.Map.of_list_exn -+ |> List.fold_left ~init:Int.Map.empty ~f:(fun acc (key, v) -> -+ Int.Map.update acc ~key ~f:(function -+ | None -> Some (Ok v) -+ | Some (Error vs) -> Some (Error (v :: vs)) -+ | Some (Ok v') -> -+ Some -+ ( if v = v' then -+ Ok v' -+ else -+ Error [ v; v' ] ))) - in - List.mapi vars ~f:(fun i (name, t) -> - let raw_val = - match Int.Map.find values i with - | None -> die "Unable to get value for %s" name -- | Some v -> v -+ | Some (Ok v) -> v -+ | Some (Error vs) -> -+ let vs = List.sort_uniq ~cmp:compare vs in -+ die "Duplicate values for %s:\n%s" name -+ (vs |> List.map ~f:(sprintf "- %s") |> String.concat ~sep:"\n") - in - let value = - match t with diff --git a/9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch b/9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch new file mode 100644 index 0000000..5f3c1df --- /dev/null +++ b/9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch @@ -0,0 +1,42 @@ +From 8a3d7f2f2015b71384caa07226d1a89dba9d6c25 Mon Sep 17 00:00:00 2001 +From: Mario Rodas +Date: Wed, 2 Sep 2020 20:00:00 -0500 +Subject: [PATCH] src/dune/setup.ml is now src/dune_rules/setup.ml + +src/dune/setup.ml was renamed in bebb7a9432b149fce95ac820757216372afb8f0f + +Signed-off-by: Mario Rodas +--- + Makefile | 2 +- + configure.ml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 4ae969a9..52d5d20a 100644 +--- a/Makefile ++++ b/Makefile +@@ -103,7 +103,7 @@ clean: $(BIN) + rm -rf _boot dune.exe + + distclean: clean +- rm -f src/dune/setup.ml ++ rm -f src/dune_rules/setup.ml + + doc: + cd doc && sphinx-build . _build +diff --git a/configure.ml b/configure.ml +index f5366f17..c1fe8d30 100644 +--- a/configure.ml ++++ b/configure.ml +@@ -44,7 +44,7 @@ let () = + let anon s = bad "Don't know what to do with %s" s in + Arg.parse (Arg.align args) anon + "Usage: ocaml configure.ml [OPTRIONS]]\nOptions are:"; +- let oc = open_out "src/dune/setup.ml" in ++ let oc = open_out "src/dune_rules/setup.ml" in + let pr fmt = fprintf oc (fmt ^^ "\n") in + pr "let library_path = %s" (option (list string) !library_path); + pr "let library_destdir = %s" (option string !library_destdir); +-- +2.26.2 + diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 748b8fe..18cf0b9 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.7.0 -Release: 6%{?dist} +Version: 2.7.1 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -22,13 +22,13 @@ License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz -# https://github.com/ocaml/dune/issues/3736 -# https://github.com/ocaml/dune/pull/3739 -Patch1: 3739.patch -Patch2: 1a9bd729b97db408022995f93b19678706a79ca7.patch +# Fix path to the configuration file +# https://github.com/ocaml/dune/pull/3757 +Patch0: 9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch BuildRequires: emacs BuildRequires: ocaml >= 4.08 +BuildRequires: ocaml-csexp-devel BuildRequires: ocaml-findlib BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-rtd-theme} @@ -44,7 +44,6 @@ BuildRequires: ocaml-menhir # doesn't seem to be able to detect libraries installed systemwide. # https://github.com/ocaml/dune/issues/220 Provides: bundled(ocaml-build-path-prefix-map) = 0.2 -Provides: bundled(ocaml-csexp) = 1.0.0 Provides: bundled(ocaml-opam-file-format) = 2.0.0 Provides: bundled(ocaml-cmdliner) = 1.0.3 Provides: bundled(ocaml-re) = 1.7.1 @@ -196,6 +195,12 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Sep 14 2020 Jerry James - 2.7.1-1 +- Version 2.7.1 +- Csexp is no longer vendored in +- Drop upstreamed patches for issue 3736 and pull request 3739 +- Fix configuration with patch from pull request 3757 + * Tue Sep 01 2020 Richard W.M. Jones - 2.7.0-6 - OCaml 4.11.1 rebuild diff --git a/sources b/sources index c26d54c..59bcf76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.7.0.tar.gz) = 6063010f7e9d34846df878d94d12517e88a376ab67372ceac9411f4a83ba6eeaf487b8809c1fcc150e0d150ce8f7b925438780920c1883aee4ea242653b4cdb8 +SHA512 (dune-2.7.1.tar.gz) = b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7 From 6f162e464e2afd8775b983ce9185d434f105d8e5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 18 Sep 2020 13:04:05 -0600 Subject: [PATCH 053/141] Add ocaml-csexp-devel R to the -devel subpackage. --- ocaml-dune.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 18cf0b9..c87eb20 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -67,6 +67,7 @@ productive. %package devel Summary: Development files for %{name} Requires: %{name}%{?isa} = %{version}-%{release} +Requires: ocaml-csexp-devel%{?_isa} %description devel The %{name}-devel package contains libraries and @@ -195,6 +196,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Sep 18 2020 Jerry James - 2.7.1-2 +- Add ocaml-csexp-devel R to the -devel subpackage + * Mon Sep 14 2020 Jerry James - 2.7.1-1 - Version 2.7.1 - Csexp is no longer vendored in From 52ecf102bfdfe697dbef37cf6e6f1d373761c924 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2020 16:40:48 -0700 Subject: [PATCH 054/141] Explicitly BR make. --- ocaml-dune.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index c87eb20..fd404ab 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -27,6 +27,7 @@ Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname Patch0: 9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch BuildRequires: emacs +BuildRequires: make BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-csexp-devel BuildRequires: ocaml-findlib From 6e96dffe9beda6f029adf80e5753fb4ffa08aaa8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 13 Jan 2021 15:40:32 -0700 Subject: [PATCH 055/141] Version 2.8.0. Drop upstreamed patch from pull request 3757. --- ...697c9f6cd5848d2083faa84836b7dd8fbd4b.patch | 42 ------------------- ocaml-dune.spec | 39 ++++++++++++----- sources | 2 +- 3 files changed, 29 insertions(+), 54 deletions(-) delete mode 100644 9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch diff --git a/9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch b/9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch deleted file mode 100644 index 5f3c1df..0000000 --- a/9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8a3d7f2f2015b71384caa07226d1a89dba9d6c25 Mon Sep 17 00:00:00 2001 -From: Mario Rodas -Date: Wed, 2 Sep 2020 20:00:00 -0500 -Subject: [PATCH] src/dune/setup.ml is now src/dune_rules/setup.ml - -src/dune/setup.ml was renamed in bebb7a9432b149fce95ac820757216372afb8f0f - -Signed-off-by: Mario Rodas ---- - Makefile | 2 +- - configure.ml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 4ae969a9..52d5d20a 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,7 +103,7 @@ clean: $(BIN) - rm -rf _boot dune.exe - - distclean: clean -- rm -f src/dune/setup.ml -+ rm -f src/dune_rules/setup.ml - - doc: - cd doc && sphinx-build . _build -diff --git a/configure.ml b/configure.ml -index f5366f17..c1fe8d30 100644 ---- a/configure.ml -+++ b/configure.ml -@@ -44,7 +44,7 @@ let () = - let anon s = bad "Don't know what to do with %s" s in - Arg.parse (Arg.align args) anon - "Usage: ocaml configure.ml [OPTRIONS]]\nOptions are:"; -- let oc = open_out "src/dune/setup.ml" in -+ let oc = open_out "src/dune_rules/setup.ml" in - let pr fmt = fprintf oc (fmt ^^ "\n") in - pr "let library_path = %s" (option (list string) !library_path); - pr "let library_destdir = %s" (option string !library_destdir); --- -2.26.2 - diff --git a/ocaml-dune.spec b/ocaml-dune.spec index fd404ab..28d8728 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.7.1 -Release: 2%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -22,14 +22,10 @@ License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz -# Fix path to the configuration file -# https://github.com/ocaml/dune/pull/3757 -Patch0: 9749697c9f6cd5848d2083faa84836b7dd8fbd4b.patch - BuildRequires: emacs BuildRequires: make BuildRequires: ocaml >= 4.08 -BuildRequires: ocaml-csexp-devel +BuildRequires: ocaml-csexp-devel >= 1.3.0 BuildRequires: ocaml-findlib BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-rtd-theme} @@ -46,8 +42,8 @@ BuildRequires: ocaml-menhir # https://github.com/ocaml/dune/issues/220 Provides: bundled(ocaml-build-path-prefix-map) = 0.2 Provides: bundled(ocaml-opam-file-format) = 2.0.0 -Provides: bundled(ocaml-cmdliner) = 1.0.3 -Provides: bundled(ocaml-re) = 1.7.1 +Provides: bundled(ocaml-cmdliner) = 1.0.4 +Provides: bundled(ocaml-re) = 1.9.0 Provides: dune = %{version}-%{release} @@ -107,9 +103,13 @@ system, a mode to edit dune files, and flymake support for dune files. ./dune.exe build @install %make_build doc -# Relink the stublib. See https://github.com/ocaml/dune/issues/2977. +# Relink the stublibs. See https://github.com/ocaml/dune/issues/2977. cd _build/default/src/stdune -ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o stdune_stubs fcntl_stubs.o +ocamlmklib -g -ldopt "%{build_ldflags}" -o stdune_stubs fcntl_stubs.o +cd - +cd _build/default/src/dune_filesystem_stubs +ocamlmklib -g -ldopt "%{build_ldflags}" -o dune_filesystem_stubs_stubs \ + $(ar t libdune_filesystem_stubs_stubs.a) cd - %install @@ -156,16 +156,22 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %dir %{_libdir}/ocaml/dune-private-libs/dune_re/ %dir %{_libdir}/ocaml/dune-private-libs/ocaml-config/ %dir %{_libdir}/ocaml/dune-private-libs/stdune/ +%dir %{_libdir}/ocaml/dune-site/ +%dir %{_libdir}/ocaml/dune-site/plugins/ %{_libdir}/ocaml/dune*/META %{_libdir}/ocaml/dune*/*.cma %{_libdir}/ocaml/dune*/*.cmi %{_libdir}/ocaml/dune-configurator/.private/ %{_libdir}/ocaml/dune-private-libs/*/*.cma %{_libdir}/ocaml/dune-private-libs/*/*.cmi +%{_libdir}/ocaml/dune-site/*/*.cma +%{_libdir}/ocaml/dune-site/*/*.cmi %ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/dune*/*.cmxs %{_libdir}/ocaml/dune-private-libs/*/*.cmxs +%{_libdir}/ocaml/dune-site/*/*.cmxs %{_libdir}/ocaml/stublibs/dllstdune_stubs.so +%{_libdir}/ocaml/stublibs/dlldune_filesystem_stubs_stubs.so %endif %files devel @@ -179,6 +185,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_libdir}/ocaml/dune-private-libs/*/*.cmti %{_libdir}/ocaml/dune-private-libs/*/*.ml %{_libdir}/ocaml/dune-private-libs/*/*.mli +%{_libdir}/ocaml/dune-site/*/*.cmt +%{_libdir}/ocaml/dune-site/*/*.cmti +%{_libdir}/ocaml/dune-site/*/*.ml +%{_libdir}/ocaml/dune-site/*/*.mli %ifarch %{ocaml_native_compiler} %{_libdir}/ocaml/dune*/*.a %{_libdir}/ocaml/dune*/*.cmx @@ -186,6 +196,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_libdir}/ocaml/dune-private-libs/*/*.a %{_libdir}/ocaml/dune-private-libs/*/*.cmx %{_libdir}/ocaml/dune-private-libs/*/*.cmxa +%{_libdir}/ocaml/dune-site/*/*.a +%{_libdir}/ocaml/dune-site/*/*.cmx +%{_libdir}/ocaml/dune-site/*/*.cmxa %endif %files doc @@ -197,6 +210,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Wed Jan 13 2021 Jerry James - 2.8.0-1 +- Version 2.8.0 +- Drop upstreamed patch from pull request 3757 + * Fri Sep 18 2020 Jerry James - 2.7.1-2 - Add ocaml-csexp-devel R to the -devel subpackage diff --git a/sources b/sources index 59bcf76..87e2aa5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.7.1.tar.gz) = b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7 +SHA512 (dune-2.8.0.tar.gz) = e594afed20a4ef7205122f60fbd839cf704602412738ee408dc24cfbdca0036b651a4b5c03ef5e0edad7a6c7fd9049624fffc7dc10774fdc73b77dee720e28a3 From 36bff69e462d3e0245966d799b9062f555eaa967 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 14 Jan 2021 20:31:36 -0700 Subject: [PATCH 056/141] Version 2.8.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 28d8728..f152f0c 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,7 +5,7 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.8.0 +Version: 2.8.1 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Jan 14 2021 Jerry James - 2.8.1-1 +- Version 2.8.1 + * Wed Jan 13 2021 Jerry James - 2.8.0-1 - Version 2.8.0 - Drop upstreamed patch from pull request 3757 diff --git a/sources b/sources index 87e2aa5..90d7f7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.8.0.tar.gz) = e594afed20a4ef7205122f60fbd839cf704602412738ee408dc24cfbdca0036b651a4b5c03ef5e0edad7a6c7fd9049624fffc7dc10774fdc73b77dee720e28a3 +SHA512 (dune-2.8.1.tar.gz) = 29c9eae450c0570c2ddf179e41329f0e04cccb1f056314be4531c88cbf801eb8b8a2a5359392db6d78779a2fc815a00edb10ad4b3075f3a4353b9116fdf1fca1 From 32d989760c901cc153155844c62c64cde409b6e2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 21 Jan 2021 16:22:45 -0700 Subject: [PATCH 057/141] Version 2.8.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 f152f0c..4e94e46 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,7 +5,7 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.8.1 +Version: 2.8.2 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Jan 21 2021 Jerry James - 2.8.2-1 +- Version 2.8.2 + * Thu Jan 14 2021 Jerry James - 2.8.1-1 - Version 2.8.1 diff --git a/sources b/sources index 90d7f7e..04af384 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.8.1.tar.gz) = 29c9eae450c0570c2ddf179e41329f0e04cccb1f056314be4531c88cbf801eb8b8a2a5359392db6d78779a2fc815a00edb10ad4b3075f3a4353b9116fdf1fca1 +SHA512 (dune-2.8.2.tar.gz) = fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7 From 6e0bc222a6a570ddc39de8ced2565dd26e845e05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:56:35 +0000 Subject: [PATCH 058/141] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 4e94e46..18c8300 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 21 2021 Jerry James - 2.8.2-1 - Version 2.8.2 From a7911740e1d42aacc784425e9c3df91db13a6fc1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Feb 2021 18:28:58 +0000 Subject: [PATCH 059/141] Bump and rebuild for updated ocaml Dynlink dependency. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 18c8300..8b6906c 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Feb 1 2021 Richard W.M. Jones - 2.8.2-3 +- Bump and rebuild for updated ocaml Dynlink dependency. + * Tue Jan 26 2021 Fedora Release Engineering - 2.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 3fcc79c83575567f01b93f9e163d4c77680955fd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 10:09:49 +0000 Subject: [PATCH 060/141] OCaml 4.12.0 build --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 8b6906c..06d7a26 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Mar 1 10:09:48 GMT 2021 Richard W.M. Jones - 2.8.2-4 +- OCaml 4.12.0 build + * Mon Feb 1 2021 Richard W.M. Jones - 2.8.2-3 - Bump and rebuild for updated ocaml Dynlink dependency. From 2f270baa4c8ebe32ff846cbf9f82983659b78576 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 8 Mar 2021 08:31:57 -0700 Subject: [PATCH 061/141] Version 2.8.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 06d7a26..5a18b41 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.8.2 -Release: 4%{?dist} +Version: 2.8.3 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Mar 8 2021 Jerry James - 2.8.3-1 +- Version 2.8.3 + * Mon Mar 1 10:09:48 GMT 2021 Richard W.M. Jones - 2.8.2-4 - OCaml 4.12.0 build diff --git a/sources b/sources index 04af384..8d834c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.8.2.tar.gz) = fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7 +SHA512 (dune-2.8.3.tar.gz) = de137eef67fdc175ade638107a112040fc309200a9a659235dbda60a2ef3804f4bdd904b24b0b53e638d7d6d0b9e677d509d6b705fa2c683a0cb664c5fcf670a From 35e6c6f15702811bdd1e67e4bbfad09bdb8a3562 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 8 Mar 2021 11:28:24 -0700 Subject: [PATCH 062/141] Version 2.8.4. --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 5a18b41..6468a63 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,7 +5,7 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.8.3 +Version: 2.8.4 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Mar 8 2021 Jerry James - 2.8.4-1 +- Version 2.8.4 + * Mon Mar 8 2021 Jerry James - 2.8.3-1 - Version 2.8.3 diff --git a/sources b/sources index 8d834c4..0d8ba8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.8.3.tar.gz) = de137eef67fdc175ade638107a112040fc309200a9a659235dbda60a2ef3804f4bdd904b24b0b53e638d7d6d0b9e677d509d6b705fa2c683a0cb664c5fcf670a +SHA512 (dune-2.8.4.tar.gz) = 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253 From 209222ba18a2c1fc7137814e77a0582d0b487f89 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 29 Mar 2021 17:18:17 -0600 Subject: [PATCH 063/141] Version 2.8.5. --- ocaml-dune.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 6468a63..08945d8 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,7 +5,7 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.8.4 +Version: 2.8.5 Release: 1%{?dist} Summary: A composable build system for OCaml @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Mar 29 2021 Jerry James - 2.8.5-1 +- Version 2.8.5 + * Mon Mar 8 2021 Jerry James - 2.8.4-1 - Version 2.8.4 diff --git a/sources b/sources index 0d8ba8d..aed4340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.8.4.tar.gz) = 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253 +SHA512 (dune-2.8.5.tar.gz) = 4d0d8611aeb945afdff4319d7195e3b84e1896e64010a2809ca59d3e0721eded3e7c560cf28ea19c93f5a82b1843d97165751060a6b2425c8db9a7cfc17d6e32 From e65929cbc67e53ca54f46042607716c848d4871f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Mar 2021 16:18:41 +0100 Subject: [PATCH 064/141] Bump and rebuild for ELN. --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 08945d8..05b4fbd 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -210,6 +210,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Tue Mar 30 2021 Richard W.M. Jones - 2.8.5-2 +- Bump and rebuild for ELN. + * Mon Mar 29 2021 Jerry James - 2.8.5-1 - Version 2.8.5 From 7d172c2d7533632bc03f99c869ac354c163e6e41 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 17 Jul 2021 13:08:20 -0600 Subject: [PATCH 065/141] Version 2.9.0. --- ocaml-dune.spec | 18 ++++++++++-------- sources | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 05b4fbd..9637141 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.8.5 -Release: 2%{?dist} +Version: 2.9.0 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -94,7 +94,11 @@ system, a mode to edit dune files, and flymake support for dune files. %autosetup -n %{libname}-%{version} -p1 %build -./configure --libdir %{_libdir}/ocaml --mandir %{_mandir} +# Also set --docdir when we are ready to migrate all ocaml packages +./configure \ + --etcdir %{_sysconfdir} \ + --libdir %{_libdir}/ocaml \ + --mandir %{_mandir} # This command fails, because ppx_bench, ppx_expect, and core_bench are missing. # However, it is only tests that fail, not the actual build, so ignore the @@ -116,11 +120,6 @@ cd - # "make install" only installs the binary. We want the libraries, too. ./dune.exe install --destdir %{buildroot} -%ifarch %{ocaml_native_compiler} -# Add missing executable bits -find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod 0755 {} \+ -%endif - # Byte compile the Emacs files cd %{buildroot}%{_emacs_sitelispdir} %_emacs_bytecompile dune.el dune-flymake.el @@ -210,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Sat Jul 17 2021 Jerry James - 2.9.0-1 +- Version 2.9.0 + * Tue Mar 30 2021 Richard W.M. Jones - 2.8.5-2 - Bump and rebuild for ELN. diff --git a/sources b/sources index aed4340..7ba9226 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.8.5.tar.gz) = 4d0d8611aeb945afdff4319d7195e3b84e1896e64010a2809ca59d3e0721eded3e7c560cf28ea19c93f5a82b1843d97165751060a6b2425c8db9a7cfc17d6e32 +SHA512 (dune-2.9.0.tar.gz) = 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24 From e601bae3863d88a42566544e401dfaa0b598ce8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 16:36:46 +0000 Subject: [PATCH 066/141] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 9637141..16b61e3 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -209,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 17 2021 Jerry James - 2.9.0-1 - Version 2.9.0 From 2cf3996c68a746fdae324e67343b8af9219c5d7d Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 27 Jul 2021 21:39:34 +0100 Subject: [PATCH 067/141] Rebuild for changed ocamlx(Dynlink) --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 16b61e3..2209e30 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.9.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -209,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Tue Jul 27 2021 Richard W.M. Jones - 2.9.0-3 +- Rebuild for changed ocamlx(Dynlink) + * Thu Jul 22 2021 Fedora Release Engineering - 2.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 2185ad6b08ad126c33bdc6f04f0d2194f39f1cc2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 8 Sep 2021 08:40:50 -0600 Subject: [PATCH 068/141] Version 2.9.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 2209e30..9113798 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.9.0 -Release: 3%{?dist} +Version: 2.9.1 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -209,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Wed Sep 8 2021 Jerry James - 2.9.1-1 +- Version 2.9.1 + * Tue Jul 27 2021 Richard W.M. Jones - 2.9.0-3 - Rebuild for changed ocamlx(Dynlink) diff --git a/sources b/sources index 7ba9226..6429163 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.9.0.tar.gz) = 1c3b64746b00215cd97b36c0f1c6e2416c9d15c795265634240e9da37e2c2fce02ab3c309a0cb967f9f20a5c6df14e943c3c2942c1a8f4743c3a19c699f4eb24 +SHA512 (dune-2.9.1.tar.gz) = 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77 From 39c2970231490195fae9ff9e904c62e93e8edde0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 20:29:20 +0100 Subject: [PATCH 069/141] Build bootstrap version without menhir --- ocaml-dune.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 9113798..55d5509 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -2,11 +2,11 @@ # Since menhir now requires dune to build, but dune needs menhir only for the # tests, build in bootstrap mode to skip the tests and the need for menhir. -%bcond_without menhir +%bcond_with menhir Name: ocaml-%{libname} Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -209,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 2.9.1-2 +- Build bootstrap version without menhir + * Wed Sep 8 2021 Jerry James - 2.9.1-1 - Version 2.9.1 From 7bd779ad7535400a638b7e91cb1b1801f2f7b7f5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 20:32:03 +0100 Subject: [PATCH 070/141] OCaml 4.13.1 build --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 55d5509..fff1d25 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -209,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Mon Oct 04 2021 Richard W.M. Jones - 2.9.1-3 +- OCaml 4.13.1 build + * Mon Oct 04 2021 Richard W.M. Jones - 2.9.1-2 - Build bootstrap version without menhir From 18a3e99eaac5160be20d87177b0048bc098bc6ca Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 4 Oct 2021 20:35:25 +0100 Subject: [PATCH 071/141] Revert "Build bootstrap version without menhir" I thought that would disable menhir, in fact it enables it. This reverts commit 39c2970231490195fae9ff9e904c62e93e8edde0. --- ocaml-dune.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index fff1d25..ab74060 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -2,7 +2,7 @@ # Since menhir now requires dune to build, but dune needs menhir only for the # tests, build in bootstrap mode to skip the tests and the need for menhir. -%bcond_with menhir +%bcond_without menhir Name: ocaml-%{libname} Version: 2.9.1 @@ -212,9 +212,6 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ * Mon Oct 04 2021 Richard W.M. Jones - 2.9.1-3 - OCaml 4.13.1 build -* Mon Oct 04 2021 Richard W.M. Jones - 2.9.1-2 -- Build bootstrap version without menhir - * Wed Sep 8 2021 Jerry James - 2.9.1-1 - Version 2.9.1 From fb83b68a6732767f3a596da37d2fe9ac30028ccd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 21:43:04 +0000 Subject: [PATCH 072/141] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 ab74060..b9fa1c6 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -209,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Oct 04 2021 Richard W.M. Jones - 2.9.1-3 - OCaml 4.13.1 build From 993a65744a6690bbb2da200af545cb40779ceae7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 26 Jan 2022 17:46:08 +0000 Subject: [PATCH 073/141] Rebuild to pick up new ocaml dependency --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index b9fa1c6..e758eb6 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -6,7 +6,7 @@ Name: ocaml-%{libname} Version: 2.9.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -209,6 +209,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Wed Jan 26 2022 Richard W.M. Jones - 2.9.1-5 +- Rebuild to pick up new ocaml dependency + * Thu Jan 20 2022 Fedora Release Engineering - 2.9.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d77b748548561e30fc7179175b888d6da5333d06 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 3 Feb 2022 15:38:54 -0700 Subject: [PATCH 074/141] Version 2.9.3. Note the bundling of ocaml-incremental-cycles. --- ocaml-dune.rpmlintrc | 14 -------------- ocaml-dune.spec | 26 ++++++++++++++++---------- sources | 2 +- 3 files changed, 17 insertions(+), 25 deletions(-) delete mode 100644 ocaml-dune.rpmlintrc diff --git a/ocaml-dune.rpmlintrc b/ocaml-dune.rpmlintrc deleted file mode 100644 index e72af52..0000000 --- a/ocaml-dune.rpmlintrc +++ /dev/null @@ -1,14 +0,0 @@ -# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON -# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors - -# The dictionary lacks some technical words -addFilter(r'W: spelling-error .* (composable|flymake)') - -# Caused by ocaml; this package cannot fix it -addFilter(r'ocaml-dune\.[^:]+: E: missing-call-to-chdir-with-chroot') - -# Documentation is in the main package -addFilter(r'ocaml-dune-.*\.[^:]+: W: no-documentation') - -# The configure script is not an autotools-generated script -addFilter(r'ocaml-dune\.spec:[^:]*: W: configure-without-libdir-spec') diff --git a/ocaml-dune.spec b/ocaml-dune.spec index e758eb6..e0ff505 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -5,8 +5,8 @@ %bcond_without menhir Name: ocaml-%{libname} -Version: 2.9.1 -Release: 5%{?dist} +Version: 2.9.3 +Release: 1%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -17,6 +17,8 @@ Summary: A composable build system for OCaml # LGPLv2 with exceptions: # - vendor/opam-file-format # - vendor/re +# MIT: +# - vendor/build_path_prefix_map License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build @@ -26,7 +28,6 @@ BuildRequires: emacs BuildRequires: make BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-csexp-devel >= 1.3.0 -BuildRequires: ocaml-findlib BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-rtd-theme} @@ -40,15 +41,16 @@ BuildRequires: ocaml-menhir # It seems to be unsupported upstream; the bootstrap process for dune # doesn't seem to be able to detect libraries installed systemwide. # https://github.com/ocaml/dune/issues/220 -Provides: bundled(ocaml-build-path-prefix-map) = 0.2 -Provides: bundled(ocaml-opam-file-format) = 2.0.0 -Provides: bundled(ocaml-cmdliner) = 1.0.4 -Provides: bundled(ocaml-re) = 1.9.0 +Provides: bundled(ocaml-build-path-prefix-map) = 0.2 +Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 +Provides: bundled(ocaml-opam-file-format) = 2.0.0 +Provides: bundled(ocaml-cmdliner) = 1.0.4 +Provides: bundled(ocaml-re) = 1.9.0 -Provides: dune = %{version}-%{release} +Provides: dune = %{version}-%{release} -Provides: jbuilder = %{version}-%{release} -Obsoletes: jbuilder < 1.0.1-3 +Provides: jbuilder = %{version}-%{release} +Obsoletes: jbuilder < 1.0.1-3 %description Dune is a build system designed for OCaml/Reason projects only. It focuses @@ -209,6 +211,10 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Thu Feb 3 2022 Jerry James - 2.9.3-1 +- Version 2.9.3 +- Note the bundling of ocaml-incremental-cycles + * Wed Jan 26 2022 Richard W.M. Jones - 2.9.1-5 - Rebuild to pick up new ocaml dependency diff --git a/sources b/sources index 6429163..e6c2489 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.9.1.tar.gz) = 4fcff34de4acc4429dd73864ca90e695d8ba436839fd679608f7db292e44be70c3db455a58f59477f2055f84ce497bfa8e90e485ed9536acad3c1b3be3d4be77 +SHA512 (dune-2.9.3.tar.gz) = df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494 From 0f29a5f36afffb61f74dca5e3cf4602ba53051c5 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 12:06:48 +0000 Subject: [PATCH 075/141] OCaml 4.13.1 rebuild to remove package notes --- ocaml-dune.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index e0ff505..487a238 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,3 +1,4 @@ +%undefine _package_note_flags %global libname dune # Since menhir now requires dune to build, but dune needs menhir only for the @@ -6,7 +7,7 @@ Name: ocaml-%{libname} Version: 2.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -211,6 +212,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Fri Feb 04 2022 Richard W.M. Jones - 2.9.3-2 +- OCaml 4.13.1 rebuild to remove package notes + * Thu Feb 3 2022 Jerry James - 2.9.3-1 - Version 2.9.3 - Note the bundling of ocaml-incremental-cycles From 489d00e5f4e6e2b99ebf9491d8e2d2341689f8bc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 4 Feb 2022 12:31:18 +0000 Subject: [PATCH 076/141] BR on emacs-nox At the time of writing emacs is not installable because of a problem with webkit (https://bugzilla.redhat.com/show_bug.cgi?id=2050480). I'm sure this will be fixed eventually, but I found that we don't need full emacs, a scratch build using emacs-nox worked fine. --- ocaml-dune.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 487a238..f37c954 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -25,7 +25,7 @@ License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz -BuildRequires: emacs +BuildRequires: emacs-nox BuildRequires: make BuildRequires: ocaml >= 4.08 BuildRequires: ocaml-csexp-devel >= 1.3.0 From 14881fd6e2bb5e520b54e0b6f484e26a67bbda0e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 18 Jun 2022 14:30:53 +0100 Subject: [PATCH 077/141] OCaml 4.14.0 rebuild --- ocaml-dune.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index f37c954..0a565d3 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -7,7 +7,7 @@ Name: ocaml-%{libname} Version: 2.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A composable build system for OCaml # Dune itself is MIT. Some bundled libraries have a different license: @@ -212,6 +212,9 @@ cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ %{_emacs_sitelispdir}/dune* %changelog +* Sat Jun 18 2022 Richard W.M. Jones - 2.9.3-3 +- OCaml 4.14.0 rebuild + * Fri Feb 04 2022 Richard W.M. Jones - 2.9.3-2 - OCaml 4.13.1 rebuild to remove package notes From 3bff422f6b68f38deabd23ea916295d09a1d6ffd Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 5 Jul 2022 09:31:01 -0600 Subject: [PATCH 078/141] Version 3.3.1. - Expose the libraries individually. - Explain why we do not run the test suite. - Use new OCaml macros. - Various spec file cleanups. --- README.md | 11 +- ocaml-dune-no-lwt.patch | 32 +++ ocaml-dune.spec | 552 +++++++++++++++++++++++++++++++--------- sources | 2 +- 4 files changed, 470 insertions(+), 127 deletions(-) create mode 100644 ocaml-dune-no-lwt.patch diff --git a/README.md b/README.md index f8ce716..6578a57 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ # ocaml-dune -The ocaml-dune package \ No newline at end of file +[Dune](https://dune.build) is a build system designed for +[OCaml](https://ocaml.org/)/[Reason](https://reasonml.github.io/) projects +only. It focuses on providing the user with a consistent experience and takes +care of most of the low-level details of OCaml compilation. All you have to +do is provide a description of your project and Dune will do the rest. + +The scheme it implements is inspired from the one used inside +[Jane Street](https://opensource.janestreet.com/) and 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. diff --git a/ocaml-dune-no-lwt.patch b/ocaml-dune-no-lwt.patch new file mode 100644 index 0000000..cc96d4d --- /dev/null +++ b/ocaml-dune-no-lwt.patch @@ -0,0 +1,32 @@ +--- 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 @@ + (copy dune-private-libs.opam.template ordering.opam.template)) + + (rule +- (copy dune-private-libs.opam.template dune-rpc-lwt.opam.template)) +- +-(rule + (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.")) + (description "Library to connect and control a running dune instance")) + + (package +- (name dune-rpc-lwt) +- (synopsis "Communicate with dune using rpc and Lwt") +- (depends +- (dune-rpc (= :version)) +- (result (>= 1.5)) +- (csexp (>= 1.5.0)) +- (lwt (>= 5.3.0)) +- base-unix) +- (description "Specialization of dune-rpc to Lwt")) +- +-(package + (name dyn) + (synopsis "Dynamic type") + (depends diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 0a565d3..c7536bd 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -1,14 +1,18 @@ +# TESTING NOTE: The testsuite requires numerous packages, many of which are +# built with dune. Furthermore, the testsuite assumes it is running in a git +# 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 -%global libname dune -# Since menhir now requires dune to build, but dune needs menhir only for the -# tests, build in bootstrap mode to skip the tests and the need for menhir. -%bcond_without menhir +# 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-%{libname} -Version: 2.9.3 -Release: 3%{?dist} -Summary: A composable build system for OCaml +Name: ocaml-dune +Version: 3.3.1 +Release: 1%{?dist} +Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: # ISC: @@ -16,42 +20,52 @@ Summary: A composable build system for OCaml # LGPLv2: # - vendor/incremental-cycles # LGPLv2 with exceptions: +# - vendor/ocaml-inotify # - vendor/opam-file-format # - vendor/re # MIT: # - vendor/build_path_prefix_map +# - vendor/spawn License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC URL: https://dune.build -Source0: https://github.com/ocaml/%{libname}/archive/%{version}/%{libname}-%{version}.tar.gz +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 BuildRequires: emacs-nox BuildRequires: make BuildRequires: ocaml >= 4.08 -BuildRequires: ocaml-csexp-devel >= 1.3.0 +BuildRequires: ocaml-csexp-devel >= 1.5.0 +BuildRequires: ocaml-pp-devel >= 1.1.0 BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx-rtd-theme} -%if %{without menhir} -# Required by tests. -BuildRequires: ocaml-menhir +%if %{with lwt} +BuildRequires: ocaml-lwt-devel %endif -# Dune has vendored deps (ugh): -# I'm not clear on how to unbundle them. -# It seems to be unsupported upstream; the bootstrap process for dune -# doesn't seem to be able to detect libraries installed systemwide. -# https://github.com/ocaml/dune/issues/220 +# 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-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 -Provides: bundled(ocaml-opam-file-format) = 2.0.0 Provides: bundled(ocaml-cmdliner) = 1.0.4 +Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 +Provides: bundled(ocaml-inotify) = 2.3 +Provides: bundled(ocaml-opam-file-format) = 2.0.0 Provides: bundled(ocaml-re) = 1.9.0 +Provides: bundled(ocaml-spawn) = 0.15.1 Provides: dune = %{version}-%{release} -Provides: jbuilder = %{version}-%{release} -Obsoletes: jbuilder < 1.0.1-3 +# This is needed for the dune-related RPM macros +Requires: python3 + +# Both packages install a binary named dune and an associated man page +Conflicts: wdune + +# Install documentation in the main package doc directory +%global _docdir_fmt %{name} %description Dune is a build system designed for OCaml/Reason projects only. It focuses @@ -64,19 +78,8 @@ 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. -%package devel -Summary: Development files for %{name} -Requires: %{name}%{?isa} = %{version}-%{release} -Requires: ocaml-csexp-devel%{?_isa} - -%description devel -The %{name}-devel package contains libraries and -signature files for developing applications that use %{name}. - %package doc Summary: HTML documentation for %{name} -Requires: %{name} = %{version}-%{release} - BuildArch: noarch %description doc @@ -86,6 +89,7 @@ HTML documentation for dune, a composable build system for OCaml. Summary: Emacs support for %{name} License: ISC Requires: %{name} = %{version}-%{release} +Requires: emacs-filesystem >= %{?_emacs_version}%{!?_emacs_version:0} BuildArch: noarch @@ -93,125 +97,423 @@ BuildArch: noarch The %{name}-devel package contains Emacs integration with the dune build system, a mode to edit dune files, and flymake support for dune files. +## Dune libraries + +%package action-plugin +Summary: API for writing dynamic dune actions +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-glob%{?_isa} = %{version}-%{release} + +%description action-plugin +This experimental library provides an API for writing dynamic Dune +actions. Dynamic dune actions do not need to declare their dependencies +upfront; they are instead discovered automatically during the execution +of the action. + +%package action-plugin-devel +Summary: Development files for %{name}-action-plugin +Requires: %{name}-action-plugin%{?_isa} = %{version}-%{release} +Requires: %{name}-glob-devel%{?_isa} = %{version}-%{release} + +%description action-plugin-devel +The ocaml-dune-action-plugin-devel package contains libraries and +signature files for developing applications that use +ocaml-dune-action-plugin. + +%package build-info +Summary: Embed build information in an executable +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description build-info +The build-info library allows access to information about how an +executable was built, such as the version of the project at which it was +built or the list of statically linked libraries with their versions. +It supports reporting the version from a version control system during +development to get a precise reference of when the executable was built. + +%package build-info-devel +Summary: Development files for %{name}-build-info +Requires: %{name}-build-info%{?_isa} = %{version}-%{release} + +%description build-info-devel +The ocaml-dune-build-info-devel package contains libraries and signature +files for developing applications that use ocaml-dune-build-info. + +%package configurator +Summary: Helper library for gathering system configuration +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-stdune%{?_isa} = %{version}-%{release} + +%description configurator +Dune-configurator is a small library that helps write OCaml scripts that +test features available on the system, in order to generate config.h +files for instance. Among other things, dune-configurator allows one +to: + +- test if a C program compiles +- query pkg-config +- import a #define from OCaml header files +- generate a config.h file + +%package configurator-devel +Summary: Development files for %{name}-configurator +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 +ocaml-dune-configurator. + +%package glob +Summary: Parser and interpreter for dune language globs +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-private-libs%{?_isa} = %{version}-%{release} +Requires: ocaml-stdune%{?_isa} = %{version}-%{release} + +%description glob +Dune-glob provides a parser and interpreter for globs as understood by +the dune language. + +%package glob-devel +Summary: Development files for %{name}-glob +Requires: %{name}-glob%{?_isa} = %{version}-%{release} +Requires: %{name}-private-libs-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} + +%description glob-devel +The ocaml-dune-glob-devel package contains libraries and signature files +for developing applications that use ocaml-dune-glob. + +%package private-libs +Summary: Private dune libraries +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 +packages. However, it is not meant for public consumption and provides +no stability guarantee. + +%package private-libs-devel +Summary: Development files for %{name}-private-libs +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 +signature files for other dune packages. Do not use. + +%package rpc +Summary: Communicate with dune using rpc +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-stdune%{?_isa} = %{version}-%{release} +Requires: ocaml-xdg%{?_isa} = %{version}-%{release} + +%description rpc +This package contains a library used to communicate with dune over rpc. + +%package rpc-devel +Summary: Development files for %{name}-rpc +Requires: %{name}-rpc%{?_isa} = %{version}-%{release} +Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-xdg-devel%{?_isa} = %{version}-%{release} + +%description rpc-devel +The ocaml-dune-rpc-devel package contains libraries and signature files +for developing applications that use ocaml-rpc. + +%if %{with lwt} +%package rpc-lwt +Summary: Communicate with dune using rpc and Lwt +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-rpc%{?_isa} = %{version}-%{release} + +%description rpc-lwt +This package contains a library used to communicate with dune over rpc +using Lwt. + +%package rpc-lwt-devel +Summary: Development files for %{name}-rpc-lwt +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 +files for developing applications that use ocaml-rpc-lwt. +%endif + +%package site +Summary: Embed location information inside executables and libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-private-libs%{?_isa} = %{version}-%{release} + +%description site +This library enables embedding location information inside executables +and libraries. + +%package site-devel +Summary: Development files for %{name}-site +Requires: %{name}-site%{?_isa} = %{version}-%{release} +Requires: %{name}-private-libs-devel%{?_isa} = %{version}-%{release} + +%description site-devel +The ocaml-dune-site-devel package contains libraries and signature files +for developing applications that use ocaml-dune-site. + +%package -n ocaml-chrome-trace +Summary: Chrome trace event generation library +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n ocaml-chrome-trace +Library to output trace data to a file in Chrome's trace_event format. +This format is compatible with chrome trace viewer (chrome://tracing). +The trace viewer is part of the catapult project. + +%package -n ocaml-chrome-trace-devel +Summary: Development files for ocaml-chrome-trace +Requires: ocaml-chrome-trace%{?_isa} = %{version}-%{release} + +%description -n ocaml-chrome-trace-devel +The ocaml-dyn-devel package contains libraries and signature files for +developing applications that use ocaml-dyn. + +%package -n ocaml-dyn +Summary: Dynamic types +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering%{?_isa} = %{version}-%{release} + +%description -n ocaml-dyn +This library supports dynamic types in OCaml. + +%package -n ocaml-dyn-devel +Summary: Development files for ocaml-dyn +Requires: ocaml-dyn%{?_isa} = %{version}-%{release} +Requires: ocaml-ordering-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-pp-devel%{?_isa} + +%description -n ocaml-dyn-devel +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 +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 +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 +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn%{?_isa} = %{version}-%{release} + +%description -n ocaml-ocamlc-loc +Parse OCaml compiler output into structured form. + +%package -n ocaml-ocamlc-loc-devel +Summary: Development files for ocaml-ocamlc-loc +Requires: ocaml-ocamlc-loc%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} + +%description -n ocaml-ocamlc-loc-devel +The ocaml-ordering-devel package contains libraries and signature files +for developing applications that use ocaml-ocamlc-loc. + +%package -n ocaml-ordering +Summary: Element ordering +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n ocaml-ordering +Element ordering in OCaml. + +%package -n ocaml-ordering-devel +Summary: Development files for ocaml-ordering +Requires: ocaml-ordering%{?_isa} = %{version}-%{release} + +%description -n ocaml-ordering-devel +The ocaml-ordering-devel package contains libraries and signature files +for developing applications that use ocaml-ordering. + +%package -n ocaml-stdune +Summary: Dune's unstable standard library +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn%{?_isa} = %{version}-%{release} + +%description -n ocaml-stdune +This package contains Dune's unstable standard library. + +%package -n ocaml-stdune-devel +Summary: Development files for ocaml-stdune +Requires: ocaml-stdune%{?_isa} = %{version}-%{release} +Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} +Requires: ocaml-csexp-devel%{?_isa} + +%description -n ocaml-stdune-devel +The ocaml-stdune-devel package contains libraries and signature files +for developing applications that use ocaml-stdune. + +%package -n ocaml-xdg +Summary: XDG Base Directory Specification +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n ocaml-xdg +This package contains the XDG Base Directory Specification. + +%package -n ocaml-xdg-devel +Summary: Development files for ocaml-xdg +Requires: ocaml-xdg%{?_isa} = %{version}-%{release} + +%description -n ocaml-xdg-devel +The ocaml-xdg-devel package contains libraries and signature files for +developing applications that use ocaml-xdg. + %prep -%autosetup -n %{libname}-%{version} -p1 +%autosetup -N -n dune-%{version} +%if %{without lwt} +%patch0 -p1 +rm -fr otherlibs/dune-rpc-lwt dune-rpc-lwt.opam +%endif %build -# Also set --docdir when we are ready to migrate all ocaml packages ./configure \ + --bindir %{_bindir} \ + --datadir %{_datadir} \ + --docdir %{_prefix}/doc \ --etcdir %{_sysconfdir} \ - --libdir %{_libdir}/ocaml \ - --mandir %{_mandir} + --libdir %{ocamldir} \ + --libexecdir %{ocamldir} \ + --mandir %{_mandir} \ + --sbindir %{_sbindir} -# This command fails, because ppx_bench, ppx_expect, and core_bench are missing. -# However, it is only tests that fail, not the actual build, so ignore the -# failures and continue. -%make_build release || : -./dune.exe build @install +%make_build release %make_build doc -# Relink the stublibs. See https://github.com/ocaml/dune/issues/2977. -cd _build/default/src/stdune -ocamlmklib -g -ldopt "%{build_ldflags}" -o stdune_stubs fcntl_stubs.o -cd - -cd _build/default/src/dune_filesystem_stubs -ocamlmklib -g -ldopt "%{build_ldflags}" -o dune_filesystem_stubs_stubs \ - $(ar t libdune_filesystem_stubs_stubs.a) -cd - +# We also want the libraries +# Do not use the bundled csexp and pp when building them +rm -fr vendor/{csexp,pp} +./dune.exe build %{?_smp_mflags} --verbose --release @install %install -# "make install" only installs the binary. We want the libraries, too. -./dune.exe install --destdir %{buildroot} +%make_install + +# Install the libraries +./dune.exe install --destdir=%{buildroot} + +# We use %%doc below +rm -fr %{buildroot}%{_prefix}/doc # Byte compile the Emacs files cd %{buildroot}%{_emacs_sitelispdir} -%_emacs_bytecompile dune.el dune-flymake.el +%_emacs_bytecompile *.el cd - -# Install documentation by way of pkgdocdir. -rm -fr %{buildroot}%{_prefix}/doc -mkdir -p %{buildroot}%{_pkgdocdir}/ -cp -ar README.md CHANGES.md MIGRATION.md doc/_build/* %{buildroot}%{_pkgdocdir}/ - -%if %{without menhir} -%check -# These are the only tests we can run. The others require components that -# either depend on dune themselves or are not available in Fedora at all. -%{buildroot}%{_bindir}/dune runtest test/unit-tests -%endif +# Generate %%files lists +%ocaml_files -s %files %license LICENSE.md -%doc %{_pkgdocdir}/README.md -%doc %{_pkgdocdir}/CHANGES.md -%doc %{_pkgdocdir}/MIGRATION.md +%doc CHANGES.md README.md %{_bindir}/dune %{_mandir}/man*/dune* -%dir %{_pkgdocdir}/ -%dir %{_libdir}/ocaml/dune/ -%dir %{_libdir}/ocaml/dune-action-plugin/ -%dir %{_libdir}/ocaml/dune-build-info/ -%dir %{_libdir}/ocaml/dune-configurator/ -%dir %{_libdir}/ocaml/dune-glob/ -%dir %{_libdir}/ocaml/dune-private-libs/ -%dir %{_libdir}/ocaml/dune-private-libs/dune-lang/ -%dir %{_libdir}/ocaml/dune-private-libs/dune_re/ -%dir %{_libdir}/ocaml/dune-private-libs/ocaml-config/ -%dir %{_libdir}/ocaml/dune-private-libs/stdune/ -%dir %{_libdir}/ocaml/dune-site/ -%dir %{_libdir}/ocaml/dune-site/plugins/ -%{_libdir}/ocaml/dune*/META -%{_libdir}/ocaml/dune*/*.cma -%{_libdir}/ocaml/dune*/*.cmi -%{_libdir}/ocaml/dune-configurator/.private/ -%{_libdir}/ocaml/dune-private-libs/*/*.cma -%{_libdir}/ocaml/dune-private-libs/*/*.cmi -%{_libdir}/ocaml/dune-site/*/*.cma -%{_libdir}/ocaml/dune-site/*/*.cmi -%ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/dune*/*.cmxs -%{_libdir}/ocaml/dune-private-libs/*/*.cmxs -%{_libdir}/ocaml/dune-site/*/*.cmxs -%{_libdir}/ocaml/stublibs/dllstdune_stubs.so -%{_libdir}/ocaml/stublibs/dlldune_filesystem_stubs_stubs.so -%endif - -%files devel -%{_libdir}/ocaml/dune*/dune-package -%{_libdir}/ocaml/dune*/opam -%{_libdir}/ocaml/dune*/*.cmt -%{_libdir}/ocaml/dune*/*.cmti -%{_libdir}/ocaml/dune*/*.ml -%{_libdir}/ocaml/dune*/*.mli -%{_libdir}/ocaml/dune-private-libs/*/*.cmt -%{_libdir}/ocaml/dune-private-libs/*/*.cmti -%{_libdir}/ocaml/dune-private-libs/*/*.ml -%{_libdir}/ocaml/dune-private-libs/*/*.mli -%{_libdir}/ocaml/dune-site/*/*.cmt -%{_libdir}/ocaml/dune-site/*/*.cmti -%{_libdir}/ocaml/dune-site/*/*.ml -%{_libdir}/ocaml/dune-site/*/*.mli -%ifarch %{ocaml_native_compiler} -%{_libdir}/ocaml/dune*/*.a -%{_libdir}/ocaml/dune*/*.cmx -%{_libdir}/ocaml/dune*/*.cmxa -%{_libdir}/ocaml/dune-private-libs/*/*.a -%{_libdir}/ocaml/dune-private-libs/*/*.cmx -%{_libdir}/ocaml/dune-private-libs/*/*.cmxa -%{_libdir}/ocaml/dune-site/*/*.a -%{_libdir}/ocaml/dune-site/*/*.cmx -%{_libdir}/ocaml/dune-site/*/*.cmxa -%endif %files doc -%exclude %{_pkgdocdir}/README.md -%exclude %{_pkgdocdir}/CHANGES.md -%doc %{_pkgdocdir}/* +%doc doc/_build/* %files emacs %{_emacs_sitelispdir}/dune* +%files action-plugin -f .ofiles-dune-action-plugin + +%files action-plugin-devel -f .ofiles-dune-action-plugin-devel + +%files build-info -f .ofiles-dune-build-info + +%files build-info-devel -f .ofiles-dune-build-info-devel + +%files configurator -f .ofiles-dune-configurator +%dir %{ocamldir}/dune/ +%{ocamldir}/dune/META + +%files configurator-devel -f .ofiles-dune-configurator-devel +%{ocamldir}/dune/dune-package +%{ocamldir}/dune/opam + +%files glob -f .ofiles-dune-glob + +%files glob-devel -f .ofiles-dune-glob-devel + +%files private-libs -f .ofiles-dune-private-libs + +%files private-libs-devel -f .ofiles-dune-private-libs-devel + +%files rpc -f .ofiles-dune-rpc + +%files rpc-devel -f .ofiles-dune-rpc-devel + +%if %{with lwt} +%files rpc-lwt -f .ofiles-dune-rpc-lwt + +%files rpc-lwt-devel -f .ofiles-dune-rpc-lwt-devel +%endif + +%files site -f .ofiles-dune-site + +%files site-devel -f .ofiles-dune-site-devel + +%files -n ocaml-chrome-trace -f .ofiles-chrome-trace + +%files -n ocaml-chrome-trace-devel -f .ofiles-chrome-trace-devel + +%files -n ocaml-dyn -f .ofiles-dyn + +%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 + +%files -n ocaml-ordering -f .ofiles-ordering + +%files -n ocaml-ordering-devel -f .ofiles-ordering-devel + +%files -n ocaml-stdune -f .ofiles-stdune + +%files -n ocaml-stdune-devel -f .ofiles-stdune-devel + +%files -n ocaml-xdg -f .ofiles-xdg + +%files -n ocaml-xdg-devel -f .ofiles-xdg-devel + %changelog +* Tue Jul 5 2022 Jerry James - 3.3.1-1 +- Version 3.3.1 +- Expose the libraries individually +- Explain why we do not run the test suite +- Use new OCaml macros +- Various spec file cleanups + * Sat Jun 18 2022 Richard W.M. Jones - 2.9.3-3 - OCaml 4.14.0 rebuild diff --git a/sources b/sources index e6c2489..05ba2f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-2.9.3.tar.gz) = df6e06a9beebf41f3ed375384be781b5c87c7949048995cc0bbad13dd65c96bd8b27415cd41e43b1112bd86524a59a7dd418e14b5c72b4f1f8fd4ac5ca2d1494 +SHA512 (dune-3.3.1.tar.gz) = c87763018a7550c40b9497718b801caa51d39410285cb44ad49b1507571162bf4142cf31186e8c4c762dab874b4cf4d6d0e11220cf910f52a31e46753a04c56a From 203d3dffb7c44f57a79bfa743142c9ddab28c9fa Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 20 Jul 2022 10:25:32 -0600 Subject: [PATCH 079/141] Version 3.4.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 c7536bd..673ac38 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -10,7 +10,7 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.3.1 +Version: 3.4.0 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -507,6 +507,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Wed Jul 20 2022 Jerry James - 3.4.0-1 +- Version 3.4.0 + * Tue Jul 5 2022 Jerry James - 3.3.1-1 - Version 3.3.1 - Expose the libraries individually diff --git a/sources b/sources index 05ba2f7..132ef07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.3.1.tar.gz) = c87763018a7550c40b9497718b801caa51d39410285cb44ad49b1507571162bf4142cf31186e8c4c762dab874b4cf4d6d0e11220cf910f52a31e46753a04c56a +SHA512 (dune-3.4.0.tar.gz) = e9cdcf023eb6047fe4118b05afa48c3e68f1bd2996fd9c4e826cfb9033dc6ba8f91348b0be82876171bbd6ea5b8ec5941a840c8c2fcdae8f813b19bd95e25352 From a0993487f4d03d1037c91c171565a1f9dd2f467d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:12:33 +0000 Subject: [PATCH 080/141] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 673ac38..6fc1d9c 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -11,7 +11,7 @@ Name: ocaml-dune Version: 3.4.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: @@ -507,6 +507,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 20 2022 Jerry James - 3.4.0-1 - Version 3.4.0 From 33ec5ddc6d6c73cf2665fb2eac7ef82132edb9e1 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 20 Oct 2022 09:12:43 -0600 Subject: [PATCH 081/141] Version 3.5.0. --- ocaml-dune.spec | 9 ++++++--- sources | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 6fc1d9c..1b6408e 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -10,8 +10,8 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.4.0 -Release: 2%{?dist} +Version: 3.5.0 +Release: 1%{?dist} Summary: Composable build system for OCaml and Reason # Dune itself is MIT. Some bundled libraries have a different license: @@ -49,7 +49,7 @@ BuildRequires: ocaml-lwt-devel # 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-cmdliner) = 1.0.4 +Provides: bundled(ocaml-cmdliner) = 1.1.1 Provides: bundled(ocaml-incremental-cycles) = 1e2030a5d5183d84561cde142eecca40e03db2a3 Provides: bundled(ocaml-inotify) = 2.3 Provides: bundled(ocaml-opam-file-format) = 2.0.0 @@ -507,6 +507,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Oct 20 2022 Jerry James - 3.5.0-1 +- Version 3.5.0 + * Fri Jul 22 2022 Fedora Release Engineering - 3.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 132ef07..01bbd78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.4.0.tar.gz) = e9cdcf023eb6047fe4118b05afa48c3e68f1bd2996fd9c4e826cfb9033dc6ba8f91348b0be82876171bbd6ea5b8ec5941a840c8c2fcdae8f813b19bd95e25352 +SHA512 (dune-3.5.0.tar.gz) = f1a94d867e1b82502aed3f7ae16adb48bd1f773c0045c3313303f29b70ec99bed4264d420c85fe7c4be2343ac970586d77705f6083049c6bec860b543fbd3c3c From f795f84fab79789aea086e63aa69b11012a1b9b7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 17 Nov 2022 09:12:17 -0700 Subject: [PATCH 082/141] Version 3.6.0. Convert License tag to SPDX. --- ocaml-dune.spec | 64 +++++++++++++++++++++++++++++++++++++++++++++---- sources | 2 +- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/ocaml-dune.spec b/ocaml-dune.spec index 1b6408e..7696d74 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -10,24 +10,23 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.5.0 +Version: 3.6.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 -# LGPLv2: +# LGPL-2.0-only: # - vendor/incremental-cycles -# LGPLv2 with exceptions: +# LGPL-2.0-only WITH OCaml-LGPL-linking-exception # - vendor/ocaml-inotify # - vendor/opam-file-format # - vendor/re # MIT: # - vendor/build_path_prefix_map # - vendor/spawn -License: MIT and LGPLv2 and LGPLv2 with exceptions and ISC - +License: MIT AND ISC AND LGPL-2.0-only AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception 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 @@ -79,9 +78,30 @@ daily by hundred of developers, which means that it is highly tested and 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 +# - _static/file.png +# - _static/language_data.js +# - _static/minus.png +# - _static/plus.png +# - _static/searchtools.js +# - _static/sphinx_highlight.js +# MIT: +# - _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. @@ -101,6 +121,7 @@ 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} @@ -112,6 +133,7 @@ of the action. %package action-plugin-devel Summary: Development files for %{name}-action-plugin +License: MIT Requires: %{name}-action-plugin%{?_isa} = %{version}-%{release} Requires: %{name}-glob-devel%{?_isa} = %{version}-%{release} @@ -122,6 +144,7 @@ ocaml-dune-action-plugin. %package build-info Summary: Embed build information in an executable +License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} %description build-info @@ -133,6 +156,7 @@ development to get a precise reference of when the executable was built. %package build-info-devel Summary: Development files for %{name}-build-info +License: MIT Requires: %{name}-build-info%{?_isa} = %{version}-%{release} %description build-info-devel @@ -141,6 +165,7 @@ 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} @@ -157,6 +182,7 @@ to: %package configurator-devel Summary: Development files for %{name}-configurator +License: MIT Requires: %{name}-configurator%{?_isa} = %{version}-%{release} Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} @@ -171,6 +197,7 @@ 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-stdune%{?_isa} = %{version}-%{release} @@ -181,6 +208,7 @@ the dune language. %package glob-devel Summary: Development files for %{name}-glob +License: MIT Requires: %{name}-glob%{?_isa} = %{version}-%{release} Requires: %{name}-private-libs-devel%{?_isa} = %{version}-%{release} Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} @@ -191,6 +219,7 @@ 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} @@ -201,6 +230,7 @@ no stability guarantee. %package private-libs-devel Summary: Development files for %{name}-private-libs +License: MIT Requires: %{name}-private-libs%{?_isa} = %{version}-%{release} Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} @@ -210,6 +240,7 @@ 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-stdune%{?_isa} = %{version}-%{release} Requires: ocaml-xdg%{?_isa} = %{version}-%{release} @@ -219,6 +250,7 @@ This package contains a library used to communicate with dune over rpc. %package rpc-devel Summary: Development files for %{name}-rpc +License: MIT Requires: %{name}-rpc%{?_isa} = %{version}-%{release} Requires: ocaml-stdune-devel%{?_isa} = %{version}-%{release} Requires: ocaml-xdg-devel%{?_isa} = %{version}-%{release} @@ -230,6 +262,7 @@ for developing applications that use ocaml-rpc. %if %{with lwt} %package rpc-lwt Summary: Communicate with dune using rpc and Lwt +License: MIT Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-rpc%{?_isa} = %{version}-%{release} @@ -239,6 +272,7 @@ using Lwt. %package rpc-lwt-devel Summary: Development files for %{name}-rpc-lwt +License: MIT Requires: %{name}-rpc-lwt%{?_isa} = %{version}-%{release} Requires: %{name}-rpc-devel%{?_isa} = %{version}-%{release} Requires: ocaml-csexp-devel%{?_isa} @@ -252,6 +286,7 @@ 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} @@ -261,6 +296,7 @@ and libraries. %package site-devel Summary: Development files for %{name}-site +License: MIT Requires: %{name}-site%{?_isa} = %{version}-%{release} Requires: %{name}-private-libs-devel%{?_isa} = %{version}-%{release} @@ -270,6 +306,7 @@ 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 @@ -279,6 +316,7 @@ The trace viewer is part of the catapult project. %package -n ocaml-chrome-trace-devel Summary: Development files for ocaml-chrome-trace +License: MIT Requires: ocaml-chrome-trace%{?_isa} = %{version}-%{release} %description -n ocaml-chrome-trace-devel @@ -287,6 +325,7 @@ 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} @@ -295,6 +334,7 @@ This library supports dynamic types in OCaml. %package -n ocaml-dyn-devel Summary: Development files for ocaml-dyn +License: MIT Requires: ocaml-dyn%{?_isa} = %{version}-%{release} Requires: ocaml-ordering-devel%{?_isa} = %{version}-%{release} Requires: ocaml-pp-devel%{?_isa} @@ -305,6 +345,7 @@ 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} @@ -313,6 +354,7 @@ 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} @@ -322,6 +364,7 @@ developing applications that use ocaml-fiber. %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} @@ -330,6 +373,7 @@ Parse OCaml compiler output into structured form. %package -n ocaml-ocamlc-loc-devel Summary: Development files for ocaml-ocamlc-loc +License: MIT Requires: ocaml-ocamlc-loc%{?_isa} = %{version}-%{release} Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} @@ -339,6 +383,7 @@ 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 @@ -346,6 +391,7 @@ Element ordering in OCaml. %package -n ocaml-ordering-devel Summary: Development files for ocaml-ordering +License: MIT Requires: ocaml-ordering%{?_isa} = %{version}-%{release} %description -n ocaml-ordering-devel @@ -354,6 +400,7 @@ 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} @@ -362,6 +409,7 @@ This package contains Dune's unstable standard library. %package -n ocaml-stdune-devel Summary: Development files for ocaml-stdune +License: MIT Requires: ocaml-stdune%{?_isa} = %{version}-%{release} Requires: ocaml-dyn-devel%{?_isa} = %{version}-%{release} Requires: ocaml-csexp-devel%{?_isa} @@ -372,6 +420,7 @@ 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 @@ -379,6 +428,7 @@ This package contains the XDG Base Directory Specification. %package -n ocaml-xdg-devel Summary: Development files for ocaml-xdg +License: MIT Requires: ocaml-xdg%{?_isa} = %{version}-%{release} %description -n ocaml-xdg-devel @@ -507,6 +557,10 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Thu Nov 17 2022 Jerry James - 3.6.0-1 +- Version 3.6.0 +- Convert License tag to SPDX + * Thu Oct 20 2022 Jerry James - 3.5.0-1 - Version 3.5.0 diff --git a/sources b/sources index 01bbd78..f9deaf0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.5.0.tar.gz) = f1a94d867e1b82502aed3f7ae16adb48bd1f773c0045c3313303f29b70ec99bed4264d420c85fe7c4be2343ac970586d77705f6083049c6bec860b543fbd3c3c +SHA512 (dune-3.6.0.tar.gz) = 4e36dd7b27458d42d848a70a44b1d4598cf254c61a6d8f287ec499af00d2e8b0005b3b260b7a90c93ec99adaad160b3f6d660ccc20f7f51ab2e393ee5d3f8463 From c23f82a54c5374b4292aff68c0fb40d93c22892a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 25 Nov 2022 10:37:20 -0700 Subject: [PATCH 083/141] Version 3.6.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 7696d74..cbc1410 100644 --- a/ocaml-dune.spec +++ b/ocaml-dune.spec @@ -10,7 +10,7 @@ %bcond_with lwt Name: ocaml-dune -Version: 3.6.0 +Version: 3.6.1 Release: 1%{?dist} Summary: Composable build system for OCaml and Reason @@ -557,6 +557,9 @@ cd - %files -n ocaml-xdg-devel -f .ofiles-xdg-devel %changelog +* Fri Nov 25 2022 Jerry James - 3.6.1-1 +- Version 3.6.1 + * Thu Nov 17 2022 Jerry James - 3.6.0-1 - Version 3.6.0 - Convert License tag to SPDX diff --git a/sources b/sources index f9deaf0..fd78c25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dune-3.6.0.tar.gz) = 4e36dd7b27458d42d848a70a44b1d4598cf254c61a6d8f287ec499af00d2e8b0005b3b260b7a90c93ec99adaad160b3f6d660ccc20f7f51ab2e393ee5d3f8463 +SHA512 (dune-3.6.1.tar.gz) = 2db83116a3d0995c8d0dfd6a1581d214f657a7d90c30dea04d5370327e13c575fed6ce74106a79c2e2fe0c02aa2912ae7a9f4e49c36985fb613b6a41de0700c9 From 50825add7a36eb0ecbf63898193acb040b4c008a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:07:09 +0000 Subject: [PATCH 084/141] 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 085/141] 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 086/141] 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 087/141] 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 088/141] 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 089/141] 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 090/141] 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 091/141] 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 092/141] 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 093/141] 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 094/141] 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 095/141] 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 096/141] 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 097/141] 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 098/141] 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 099/141] 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 100/141] 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 101/141] 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 102/141] 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 103/141] 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 104/141] 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 105/141] 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 106/141] 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 107/141] 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 108/141] 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 109/141] 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 110/141] 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 111/141] 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 112/141] 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 113/141] 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 114/141] 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 115/141] 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 116/141] 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 117/141] 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 118/141] 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 119/141] 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 120/141] 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 121/141] 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 122/141] 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 123/141] 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 124/141] 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 125/141] 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 126/141] 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 127/141] 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 128/141] 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 129/141] 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 130/141] 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 131/141] 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 132/141] 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 133/141] 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 134/141] 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 135/141] 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 136/141] 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 137/141] 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 138/141] 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 139/141] 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 140/141] 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 141/141] 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