From 3e6c851deec63a61ac786807614351cf668f84a3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Feb 19 2020 22:27:17 +0000 Subject: New upstream release. Build with alcotest support. Build documentation with odoc, and ship it in a new doc subpackage. --- diff --git a/.gitignore b/.gitignore index ed63ab0..4d001bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/ocaml-qcheck-0.7.tar.gz -/ocaml-qcheck-0.8.tar.gz -/ocaml-qcheck-0.10.tar.gz -/ocaml-qcheck-0.12.tar.gz +/ocaml-qcheck-*.tar.gz diff --git a/ocaml-qcheck.spec b/ocaml-qcheck.spec index 8484202..fd982a7 100644 --- a/ocaml-qcheck.spec +++ b/ocaml-qcheck.spec @@ -1,6 +1,6 @@ Name: ocaml-qcheck -Version: 0.12 -Release: 3%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: QuickCheck inspired property-based testing for OCaml License: BSD @@ -9,8 +9,8 @@ Source0: https://github.com/c-cube/qcheck/archive/%{version}/%{name}-%{ve BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-ocamlbuild -BuildRequires: ocaml-findlib +BuildRequires: ocaml-odoc +BuildRequires: ocaml-alcotest-devel BuildRequires: ocaml-ounit-devel @@ -30,18 +30,32 @@ The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. +%package doc +Summary: Documentation for %{name} +BuildArch: noarch + + +%description doc +Documentation for %{name}. + + %prep %setup -q -n qcheck-%{version} +# Work around name change in recent ounit versions +sed -i 's/oUnit/ounit2/' src/ounit/dune + %build -# do not build alcotest support since it is not packaged yet -dune build @install -p qcheck,qcheck-core,qcheck-ounit --verbose +dune build %{?_smp_mflags} @install --verbose +dune build %{?_smp_mflags} @doc %install -mkdir -p %{buildroot}%{_libdir}/ocaml -dune install --destdir=%{buildroot} qcheck qcheck-core qcheck-ounit +dune install --destdir=%{buildroot} + +# We do not want the dune markers +find _build/default/_doc/_html -name .dune-keep -delete # These files will be installed using doc and license directives. rm -r %{buildroot}%{_prefix}/doc @@ -56,15 +70,14 @@ dune runtest --no-buffer --profile release %files %doc README.adoc CHANGELOG.md %license LICENSE -%{_libdir}/ocaml/* -%{_libdir}/ocaml/*/* +%dir %{_libdir}/ocaml/qcheck-alcotest/ +%dir %{_libdir}/ocaml/qcheck-core/ +%dir %{_libdir}/ocaml/qcheck-ounit/ +%{_libdir}/ocaml/*/{,*/}*.cma +%{_libdir}/ocaml/*/{,*/}*.cmi %ifarch %{ocaml_native_compiler} -%exclude %{_libdir}/ocaml/*/{,*/}*.a -%exclude %{_libdir}/ocaml/*/{,*/}*.cmxa -%exclude %{_libdir}/ocaml/*/{,*/}*.cmx +%{_libdir}/ocaml/*/{,*/}*.cmxs %endif -%exclude %{_libdir}/ocaml/*/{,*/}*.ml -%exclude %{_libdir}/ocaml/*/{,*/}*.mli %files devel @@ -86,7 +99,19 @@ dune runtest --no-buffer --profile release %{_libdir}/ocaml/*/opam +%files doc +%doc _build/default/_doc/_html/ +%doc _build/default/_doc/_mlds/ +%doc _build/default/_doc/_odoc/ +%license LICENSE + + %changelog +* Wed Feb 19 2020 Jerry James - 0.13-1 +- New upstream release. +- Build with alcotest support. +- Build documentation with odoc, and ship it in a new doc subpackage. + * Wed Jan 29 2020 Fedora Release Engineering - 0.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index e4338ba..a9721eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ocaml-qcheck-0.12.tar.gz) = a8b844d66b65fdc8cd1cb2ff1a84801815501559dccac5e4188593f5b294ca318f7de971987ce810b6f7840a292999a98ea8beb1e2c989ee3abd78314fca3ad3 +SHA512 (ocaml-qcheck-0.13.tar.gz) = eab2f5a4ef79d061c2c708ea481b735f106752b1c7797b61d5d3c11e5003e57c103b0e3260e2797521d4faa6f4d9d6ce343b499d032fd65fd1bba4a94ab996eb