- Remove usage of ocaml-dune-bootstrap, following changes in ocaml-dune

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-pp?expand=0&rev=6
This commit is contained in:
Olaf Hering 2022-04-09 19:45:38 +00:00 committed by Git OBS Bridge
parent 464bb5aa47
commit fbadff17f2
2 changed files with 6 additions and 9 deletions

View File

@ -1,6 +1,11 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 4 04:04:04 UTC 2022 - ohering@suse.de Mon Apr 4 04:04:04 UTC 2022 - ohering@suse.de
- Remove usage of ocaml-dune-bootstrap, following changes in ocaml-dune
-------------------------------------------------------------------
Mon Apr 4 04:04:04 UTC 2022 - ohering@suse.de
- Build with ocaml-dune-bootstrap - Build with ocaml-dune-bootstrap
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -38,12 +38,8 @@ Group: Development/Languages/OCaml
BuildRoot: %_tmppath/%name-%version-build BuildRoot: %_tmppath/%name-%version-build
URL: https://opam.ocaml.org/packages/pp URL: https://opam.ocaml.org/packages/pp
Source0: %pkg-%version.tar.xz Source0: %pkg-%version.tar.xz
%if "%build_flavor" == ""
BuildRequires: ocaml-dune-bootstrap
%else
BuildRequires: ocaml-dune >= 2.0 BuildRequires: ocaml-dune >= 2.0
%endif BuildRequires: ocaml-rpm-macros >= 20220409
BuildRequires: ocaml-rpm-macros >= 20220222
BuildRequires: ocaml(ocaml_base_version) >= 4.08 BuildRequires: ocaml(ocaml_base_version) >= 4.08
%if "%build_flavor" == "testsuite" %if "%build_flavor" == "testsuite"
@ -69,9 +65,6 @@ developing applications that use %name.
%setup -q -n %pkg-%version %setup -q -n %pkg-%version
%build %build
%if "%build_flavor" == ""
export PATH="%ocaml_dune_bootstrap_directory:$PATH"
%endif
dune_release_pkgs='pp' dune_release_pkgs='pp'
%ocaml_dune_setup %ocaml_dune_setup
%if "%build_flavor" == "" %if "%build_flavor" == ""
@ -80,7 +73,6 @@ dune_release_pkgs='pp'
%install %install
%if "%build_flavor" == "" %if "%build_flavor" == ""
export PATH="%ocaml_dune_bootstrap_directory:$PATH"
%ocaml_dune_install %ocaml_dune_install
%ocaml_create_file_list %ocaml_create_file_list
%endif %endif