diff --git a/ocaml-bisect-ppx.spec b/ocaml-bisect-ppx.spec index cb41c3c..93a838e 100644 --- a/ocaml-bisect-ppx.spec +++ b/ocaml-bisect-ppx.spec @@ -15,8 +15,8 @@ %bcond_with odoc Name: ocaml-%{srcname} -Version: 2.4.1 -Release: 6%{?dist}.1 +Version: 2.5.0 +Release: 1%{?dist} Summary: Code coverage for OCaml and Reason License: MIT @@ -26,19 +26,22 @@ Source0: https://github.com/aantron/%{upname}/archive/%{version}/%{upname BuildRequires: git-core BuildRequires: ocaml >= 4.02.0 BuildRequires: ocaml-cmdliner-devel >= 1.0.0 -BuildRequires: ocaml-dune -BuildRequires: ocaml-findlib +BuildRequires: ocaml-dune >= 2.7.0 BuildRequires: ocaml-migrate-parsetree-devel >= 1.7.0 %if %{with odoc} BuildRequires: ocaml-odoc -%else -BuildRequires: ocaml-ocamldoc %endif %if %{with tests} +BuildRequires: ocaml-findlib BuildRequires: ocaml-ounit-devel %endif BuildRequires: ocaml-ppx-tools-versioned-devel >= 5.4.0 +%if %{without doc} +Obsoletes: %{name}-doc < 2.5.0-1 +Provides: %{name}-doc = %{version}-%{release} +%endif + %description Bisect_ppx is a code coverage tool for OCaml. It helps you test thoroughly by showing which parts of your code are *not* tested. It is @@ -60,30 +63,23 @@ Requires: ocaml-ppx-tools-versioned-devel%{?_isa} The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. +%if %{with odoc} %package doc Summary: Documentation for %{name} BuildArch: noarch %description doc Documentation for %{name}. +%endif %prep %autosetup -n %{upname}-%{version} %build -dune build %{?_smp_mflags} +dune build %{?_smp_mflags} @install %if %{with odoc} dune build %{?_smp_mflags} @doc -%else -mkdir html -ocamldoc -html -d html \ - -I _build/default/src/report/.report.eobjs/byte \ - -I +ppx_tools_versioned \ - _build/default/src/common/*.mli \ - _build/default/src/runtime/native/*.mli \ - _build/default/src/ppx/{exclude,exclusions,instrument}.mli \ - _build/default/src/report/*.mli %endif %install @@ -156,6 +152,7 @@ make test %{_libdir}/ocaml/%{upname}/runtime/bisect*.cmti %{_libdir}/ocaml/%{upname}/runtime/*.mli +%if %{with odoc} %files doc %if %{with odoc} %doc _build/default/_doc/_html/ @@ -165,8 +162,13 @@ make test %doc html %endif %license LICENSE.md +%endif %changelog +* Fri Oct 23 2020 Jerry James - 2.5.0-1 +- Version 2.5.0 +- Building documentation with ocamldoc no longer works + * Wed Sep 02 2020 Richard W.M. Jones - 2.4.1-6.1 - Bump release and rebuild. diff --git a/sources b/sources index 2e30904..c517da3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bisect_ppx-2.4.1.tar.gz) = 979de36bc2cdf97e0c8b5afaea494a30e991c33dc19f90c318c0d4734e4c572e36ed156325065ccfe9fbe011684435be400293ca189602a9807e8f2d234daf8d +SHA512 (bisect_ppx-2.5.0.tar.gz) = f8282e4f143b9fc64971566779df74c5d520e5e9ba3d19150dad3ee48bcff70d7dcac964197fda78c309b24631c885609477d4b53746ad00ab72d5c228f5cf8f