From fbadff17f214382ac36b85da6496e9e89317025129a135a5f7de8b8d6c757317 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Sat, 9 Apr 2022 19:45:38 +0000 Subject: [PATCH 1/2] - 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 --- ocaml-pp.changes | 5 +++++ ocaml-pp.spec | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/ocaml-pp.changes b/ocaml-pp.changes index 0b51f30..aba66f1 100644 --- a/ocaml-pp.changes +++ b/ocaml-pp.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-pp.spec b/ocaml-pp.spec index d53b1a2..edc9ff0 100644 --- a/ocaml-pp.spec +++ b/ocaml-pp.spec @@ -38,12 +38,8 @@ Group: Development/Languages/OCaml BuildRoot: %_tmppath/%name-%version-build URL: https://opam.ocaml.org/packages/pp Source0: %pkg-%version.tar.xz -%if "%build_flavor" == "" -BuildRequires: ocaml-dune-bootstrap -%else BuildRequires: ocaml-dune >= 2.0 -%endif -BuildRequires: ocaml-rpm-macros >= 20220222 +BuildRequires: ocaml-rpm-macros >= 20220409 BuildRequires: ocaml(ocaml_base_version) >= 4.08 %if "%build_flavor" == "testsuite" @@ -69,9 +65,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='pp' %ocaml_dune_setup %if "%build_flavor" == "" @@ -80,7 +73,6 @@ dune_release_pkgs='pp' %install %if "%build_flavor" == "" -export PATH="%ocaml_dune_bootstrap_directory:$PATH" %ocaml_dune_install %ocaml_create_file_list %endif From a1467893e9cf632644392f8dfd23eedf6b93582144d7f253fed90bd1149e80a6 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Sat, 9 Apr 2022 19:53:33 +0000 Subject: [PATCH 2/2] date OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-pp?expand=0&rev=7 --- ocaml-pp.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-pp.changes b/ocaml-pp.changes index aba66f1..659d4f3 100644 --- a/ocaml-pp.changes +++ b/ocaml-pp.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Mon Apr 4 04:04:04 UTC 2022 - ohering@suse.de +Sat Apr 9 12:34:56 UTC 2022 - ohering@suse.de - Remove usage of ocaml-dune-bootstrap, following changes in ocaml-dune