diff --git a/dune.spec b/dune.spec index b9046c0..53e2f9d 100644 --- a/dune.spec +++ b/dune.spec @@ -1,5 +1,5 @@ Name: dune -Version: 2.9.3 +Version: 3.9.1 Release: 1mamba Summary: A composable build system for OCaml Group: Development/Tools @@ -12,9 +12,9 @@ License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel BuildRequires: ocaml -BuildRequires: ocaml-csexp +BuildRequires: ocaml-runtime ## AUTOBUILDREQ-END -BuildRequires: ocaml >= 4.11.1 +BuildRequires: ocaml >= 4.14.1 BuildRequires: ocaml-findlib %description @@ -26,19 +26,31 @@ A composable build system for OCaml. %setup -q %build -dune_release_pkgs='dune,dune-action-plugin,dune-build-info,dune-configurator,dune-glob,dune-private-libs,dune-site' -make dune.exe -./dune.exe build -p $dune_release_pkgs --profile dune-bootstrap +./configure --libdir %{_libdir}/ocaml + +make _boot/dune.exe # this runs `ocaml bootstrap.ml`, but keeps upstream's choice + +# dune build needs a comma separated list of packages +dune_release_pkgs="dune,dune-action-plugin,dune-build-info,dune-configurator,dune-glob,\ +dune-private-libs,dune-site,dune-rpc,dyn,stdune,ordering,xdg,chrome-trace,ocamlc-loc" + +./dune.exe build -p "${dune_release_pkgs}" --profile dune-bootstrap %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -./dune.exe install \ - --destdir=%{buildroot} \ - --prefix=%{_prefix} \ - --mandir=%{_mandir} \ - --libdir=$(ocamlfind printconf destdir) - +dune_release_pkgs="dune dune-action-plugin dune-build-info dune-configurator dune-glob \ + dune-private-libs dune-site dune-rpc dyn stdune ordering xdg chrome-trace ocamlc-loc" + +# we need to install packages one by one +for _pkg in "${dune_release_pkgs[@]}"; do + ./dune.exe install "${_pkg}" \ + --destdir="%{buildroot}" \ + --prefix=%{_prefix} \ + --mandir=%{_mandir} \ + --libdir="$(ocamlfind printconf destdir)" +done + mv %{buildroot}%{_prefix}/doc %{buildroot}%{_datadir} %clean @@ -47,34 +59,45 @@ mv %{buildroot}%{_prefix}/doc %{buildroot}%{_datadir} %files %defattr(-,root,root) %{_bindir}/dune -#%{_bindir}/jbuilder -#%{_bindir}/ocaml-syntax-shims -%{_datadir}/emacs/site-lisp/dune-flymake.el -%{_datadir}/emacs/site-lisp/dune.el +%{_datadir}/emacs/site-lisp/dune*.el +%dir %{_libdir}/ocaml/chrome-trace +%{_libdir}/ocaml/chrome-trace/* %dir %{_libdir}/ocaml/dune %{_libdir}/ocaml/dune/* %dir %{_libdir}/ocaml/dune-action-plugin %{_libdir}/ocaml/dune-action-plugin/* %dir %{_libdir}/ocaml/dune-build-info %{_libdir}/ocaml/dune-build-info/* -#%dir %{_libdir}/ocaml/dune-build -#%{_libdir}/ocaml/dune-build/* %dir %{_libdir}/ocaml/dune-configurator %{_libdir}/ocaml/dune-configurator/* %dir %{_libdir}/ocaml/dune-configurator/.private %{_libdir}/ocaml/dune-configurator/.private/* +%dir %{_libdir}/ocaml/dune-rpc +%{_libdir}/ocaml/dune-rpc/* +%dir %{_libdir}/ocaml/dyn +%{_libdir}/ocaml/dyn/* %dir %{_libdir}/ocaml/dune-glob %{_libdir}/ocaml/dune-glob/* +%dir %{_libdir}/ocaml/ocamlc-loc +%{_libdir}/ocaml/ocamlc-loc/* %dir %{_libdir}/ocaml/dune-private-libs %{_libdir}/ocaml/dune-private-libs/* %dir %{_libdir}/ocaml/dune-site %{_libdir}/ocaml/dune-site/* +%dir %{_libdir}/ocaml/ordering +%{_libdir}/ocaml/ordering/* +%dir %{_libdir}/ocaml/stdune +%{_libdir}/ocaml/stdune/* +%dir %{_libdir}/ocaml/xdg +%{_libdir}/ocaml/xdg/* %dir %{_libdir}/ocaml/stublibs %{_libdir}/ocaml/stublibs/*.so %dir %{_docdir}/dune %{_docdir}/dune/* %{_mandir}/man1/dune*.1* %{_mandir}/man5/dune-config.5* +%dir %{_docdir}/chrome-trace +%{_docdir}/chrome-trace/* %dir %{_docdir}/dune-action-plugin %{_docdir}/dune-action-plugin/* %dir %{_docdir}/dune-build-info @@ -85,10 +108,28 @@ mv %{buildroot}%{_prefix}/doc %{buildroot}%{_datadir} %{_docdir}/dune-glob/* %dir %{_docdir}/dune-private-libs %{_docdir}/dune-private-libs/* +%dir %{_docdir}/dune-rpc +%{_docdir}/dune-rpc/* %dir %{_docdir}/dune-site %{_docdir}/dune-site/* +%dir %{_docdir}/dyn +%{_docdir}/dyn/* +%dir %{_docdir}/ocamlc-loc +%{_docdir}/ocamlc-loc/* +%dir %{_docdir}/ordering +%{_docdir}/ordering/* +%dir %{_docdir}/stdune +%{_docdir}/stdune/* +%dir %{_docdir}/xdg +%{_docdir}/xdg/* %changelog +* Fri Jul 07 2023 Automatic Build System 3.9.1-1mamba +- automatic version update by autodist + +* Fri Jun 30 2023 Automatic Build System 3.9.0-1mamba +- automatic version update by autodist + * Fri Jan 28 2022 Automatic Build System 2.9.3-1mamba - automatic version update by autodist