From 506e98cef083c8249d1a96e732c35d3435b54908566cfc7189486d0a165724f4 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 21 Feb 2020 13:40:18 +0000 Subject: [PATCH 1/2] - Require current ocaml-rpm-macros - Build conditionally with ocaml-alcotest OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=22 --- ocaml-calendar.changes | 6 ++++++ ocaml-calendar.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ocaml-calendar.changes b/ocaml-calendar.changes index 93a2fa4..953bd1d 100644 --- a/ocaml-calendar.changes +++ b/ocaml-calendar.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de + +- Require current ocaml-rpm-macros +- Build conditionally with ocaml-alcotest + ------------------------------------------------------------------- Fri Nov 1 12:34:56 UTC 2019 - ohering@suse.de diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 6d07dab..33077c9 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -16,7 +16,7 @@ # -%bcond_with ocaml_do_dune_runtest +%bcond_with ocaml_alcotest Name: ocaml-calendar Version: 2.04 Release: 0 @@ -28,10 +28,10 @@ Url: https://github.com/ocaml-community/calendar Source0: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocaml-rpm-macros >= 20200220 BuildRequires: ocamlfind(re) BuildRequires: ocamlfind(unix) -%if %{with ocaml_do_dune_runtest} +%if %{with ocaml_alcotest} BuildRequires: ocamlfind(alcotest) %endif @@ -61,7 +61,7 @@ dune_release_pkgs='calendar' %ocaml_dune_install %ocaml_create_file_list -%if %{with ocaml_do_dune_runtest} +%if %{with ocaml_alcotest} %check %ocaml_dune_test %endif From 8180b19f24b02e8b0ea796c21abca0f0996d98e03942b07044ff0a5fa9775549 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 21 Feb 2020 13:56:23 +0000 Subject: [PATCH 2/2] allow make check failuer OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=23 --- ocaml-calendar.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ocaml-calendar.spec b/ocaml-calendar.spec index 33077c9..6bdd533 100644 --- a/ocaml-calendar.spec +++ b/ocaml-calendar.spec @@ -61,10 +61,9 @@ dune_release_pkgs='calendar' %ocaml_dune_install %ocaml_create_file_list -%if %{with ocaml_alcotest} %check +dune_test_tolerate_fail='dune_test_tolerate_fail' %ocaml_dune_test -%endif %files -f %{name}.files