Accepting request 884994 from devel:languages:ocaml

- Update to version 2.8.5
  see included CHANGES.md for details

OBS-URL: https://build.opensuse.org/request/show/884994
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-dune?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2021-04-28 23:37:04 +00:00 committed by Git OBS Bridge
commit 5cf4e42a7f
6 changed files with 56 additions and 12 deletions

3
_multibuild Normal file
View File

@ -0,0 +1,3 @@
<multibuild>
<package>configurator</package>
</multibuild>

View File

@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">ocaml-dune</param>
<param name="revision">85b4e16bd6c310811fcc206d3d0cbb391eb8b81c</param>
<param name="revision">e84ba5230f6afacb12f022937138a752f1c301b6</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/ocaml/dune.git</param>

View File

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

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

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de
- Update to version 2.8.5
see included CHANGES.md for details
-------------------------------------------------------------------
Thu Aug 20 20:20:20 UTC 2020 - ohering@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package ocaml-dune
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,23 +15,46 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define build_flavor @BUILD_FLAVOR@%{nil}
%if "%{build_flavor}" == ""
%define nsuffix %{nil}
%else
%define nsuffix -%{build_flavor}
%endif
Name: ocaml-dune
Version: 2.7.0
%define pkg ocaml-dune
Name: %{pkg}%{nsuffix}
Version: 2.8.5
Release: 0
%{?ocaml_preserve_bytecode}
Summary: A composable build system for OCaml
License: MIT
Group: Development/Languages/OCaml
BuildRoot: %_tmppath/%name-%version-build
URL: https://opam.ocaml.org/packages/dune
Source: %{name}-%{version}.tar.xz
Source0: %{pkg}-%{version}.tar.xz
Requires: ocamlfind(compiler-libs)
BuildRequires: ocaml-rpm-macros >= 20200514
BuildRequires: ocaml-rpm-macros >= 20210409
BuildRequires: ocaml(ocaml_base_version) >= 4.08
%if "%{build_flavor}" == ""
BuildRequires: ocamlfind(compiler-libs)
%description
A composable build system for OCaml
%endif
%if "%{build_flavor}" == "configurator"
BuildRequires: ocaml-dune = %{version}
BuildRequires: ocamlfind(csexp)
BuildRequires: ocamlfind(result)
%description
dune-configurator is a small library that helps writing 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 #define from OCaml header files
- generate config.h file
%endif
%package devel
Summary: Development files for %{name}
@ -43,9 +66,11 @@ The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
%prep
%autosetup -p1
%setup -q -n %{pkg}-%{version}
%build
%if "%{build_flavor}" == ""
mv -vb src/dune_rules/setup.defaults.ml src/dune_rules/setup.ml
ocaml configure.ml '--libdir=%{ocaml_standard_library}' '--mandir=%{_mandir}'
ocaml bootstrap.ml
rm -rfv '%{_tmppath}/%{name}-%{release}'
@ -54,7 +79,13 @@ mkdir -vm 0700 '%{_tmppath}/%{name}-%{release}/bin'
test -x "$PWD/dune.exe"
ln -vs "$_" '%{_tmppath}/%{name}-%{release}/bin/dune'
export "PATH=%{_tmppath}/%{name}-%{release}/bin:$PATH"
dune_release_pkgs='dune,dune-action-plugin,dune-build-info,dune-configurator,dune-glob,dune-private-libs'
dune_release_pkgs='dune,dune-action-plugin,dune-build-info,dune-glob,dune-private-libs'
%endif
#
%if "%{build_flavor}" == "configurator"
dune_release_pkgs='dune-configurator'
%endif
#
%ocaml_dune_setup
%ocaml_dune_build
@ -65,12 +96,16 @@ export "PATH=%{_tmppath}/%{name}-%{release}/bin:$PATH"
rm -rfv '%{_tmppath}/%{name}-%{release}'
%files -f %{name}.files
%defattr(-,root,root,-)
%if "%{build_flavor}" == ""
%doc CHANGES.md README.md
%doc doc/*.rst
%{_bindir}/*
%{_mandir}/*/*
%{_datadir}/emacs
%endif
%files devel -f %{name}.files.devel
%defattr(-,root,root,-)
%changelog