From 6e55a99c4a37d04593855135f79b02b18134bacc326da3ac4328c6f8edb64993 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Sat, 9 Apr 2022 19:44:53 +0000 Subject: [PATCH] - Remove usage of ocaml-dune-bootstrap, following changes in ocaml-dune OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-csexp?expand=0&rev=13 --- ocaml-csexp.changes | 5 +++++ ocaml-csexp.spec | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ocaml-csexp.changes b/ocaml-csexp.changes index 984ad5c..253f055 100644 --- a/ocaml-csexp.changes +++ b/ocaml-csexp.changes @@ -1,6 +1,11 @@ ------------------------------------------------------------------- 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 ------------------------------------------------------------------- diff --git a/ocaml-csexp.spec b/ocaml-csexp.spec index 8cf546f..ab95bed 100644 --- a/ocaml-csexp.spec +++ b/ocaml-csexp.spec @@ -39,12 +39,8 @@ BuildRoot: %_tmppath/%name-%version-build URL: https://opam.ocaml.org/packages/csexp Source0: %pkg-%version.tar.xz BuildRequires: ocaml -%if "%build_flavor" == "" -BuildRequires: ocaml-dune-bootstrap -%else BuildRequires: ocaml-dune -%endif -BuildRequires: ocaml-rpm-macros >= 20220222 +BuildRequires: ocaml-rpm-macros >= 20220409 %if "%build_flavor" == "testsuite" BuildRequires: ocamlfind(csexp) @@ -71,9 +67,6 @@ developing applications that use %name. %setup -q -n %pkg-%version %build -%if "%build_flavor" == "" -export PATH="%ocaml_dune_bootstrap_directory:$PATH" -%endif dune_release_pkgs='csexp' %ocaml_dune_setup %if "%build_flavor" == "" @@ -82,7 +75,6 @@ dune_release_pkgs='csexp' %install %if "%build_flavor" == "" -export PATH="%ocaml_dune_bootstrap_directory:$PATH" %ocaml_dune_install %ocaml_create_file_list %endif