- update version 2.3.1

see included CHANGES.md for details

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-dune?expand=0&rev=46
This commit is contained in:
Olaf Hering 2020-02-29 21:36:27 +00:00 committed by Git OBS Bridge
parent b358924dbc
commit 2ee134faee
5 changed files with 42 additions and 20 deletions

View File

@ -1,11 +1,13 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/ocaml/dune.git</param>
<param name="scm">git</param>
<param name="versionformat">@PARENT_TAG@</param>
<!-- 1.11.4 -->
<param name="revision">a2cef6466c66050223b6944e68f8cdefc88fcc4e</param>
<param name="filename">ocaml-dune</param>
<param name="revision">4e9ca5de1bf9eb8cd3d2277634d418ba747be864</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/ocaml/dune.git</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param>
<param name="versionrewrite-replacement">\1</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:89060fee4b6b42d5a6e50640ab12f4ac018191d001890538d674222534fdba26
size 628060

3
ocaml-dune-2.3.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3a154d6ca923c3d315c31c779e38e244aacb24db79b2a38053e8f00d7b6e0fdc
size 896604

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Feb 29 20:20:20 UTC 2020 - ohering@suse.de
- update version 2.3.1
see included CHANGES.md for details
-------------------------------------------------------------------
Mon Nov 25 12:34:56 UTC 2019 - ohering@suse.de

View File

@ -17,21 +17,19 @@
Name: ocaml-dune
Version: 1.11.4
Version: 2.3.1
Release: 0
%{?ocaml_preserve_bytecode}
Summary: A composable build system for OCaml
License: MIT
Group: Development/Languages/OCaml
Url: https://dune.build/
Conflicts: ocaml-jbuilder
Conflicts: ocaml-jbuilder-debuginfo
Conflicts: ocaml-jbuilder-debugsource
Url: https://opam.ocaml.org/packages/dune
Source: %{name}-%{version}.tar.xz
Patch0: dune.patch
Requires: ocamlfind(compiler-libs)
BuildRequires: ocaml(ocaml_base_version) < 4.06
BuildRequires: ocaml(ocaml_base_version) >= 4.07
BuildRequires: ocamlfind(compiler-libs)
BuildRequires: ocaml-rpm-macros >= 20191101
BuildRequires: ocaml-rpm-macros >= 20200220
%description
A composable build system for OCaml
@ -49,19 +47,35 @@ developing applications that use %{name}.
%autosetup -p1
%build
ocaml configure.ml --libdir=$(ocamlc -where)
%make_build
ocaml configure.ml '--libdir=%{ocaml_standard_library}' '--mandir=%{_mandir}'
if bash -c '
%make_build release-with-libraries
'
then
exit 0
fi
ocamlc -config
cat _olh/default/otherlibs/configurator/src/flags/flags.sexp
exit 1
%install
#make_install PREFIX='%{_prefix}' LIBDIR="$(ocamlc -where)"
if pushd _boot/default/bin/main
make PREFIX='%{_prefix}' 'LIBDIR=%{ocaml_standard_library}' 'DESTDIR=%{buildroot}' install-with-libraries
%if 0
if pushd _boot/default/bin
then
ln -svb main_dune.exe dune
ln -svb main.exe dune
export PATH="`readlink -f \"$PWD\"`:$PATH"
popd
fi
OCAML_DUNE_INSTALL_ARGS='dune --build-dir _boot'
%ocaml_dune_install
%else
rm -rfv %{buildroot}%{_prefix}/doc ; \
if test -d %{buildroot}%{_prefix}/man ; then \
mkdir -vp %{buildroot}%{_datadir} ; \
mv -vt %{buildroot}%{_datadir} %{buildroot}%{_prefix}/man ; \
fi
%endif
%ocaml_create_file_list
%files -f %{name}.files