Rebuild for ocaml-ppxlib 0.22.1.

There is no circular dependency, so build with ocaml-odoc always.
This commit is contained in:
Jerry James 2021-06-22 11:54:21 -06:00
parent 2a45252a24
commit e9411773c6

View File

@ -2,16 +2,12 @@
%global debug_package %{nil} %global debug_package %{nil}
%endif %endif
# Documentation adds a circular dependency, so by
# default we build without.
%bcond_with doc
%global srcname ppx-enumerate %global srcname ppx-enumerate
%global upname ppx_enumerate %global upname ppx_enumerate
Name: ocaml-%{srcname} Name: ocaml-%{srcname}
Version: 0.14.0 Version: 0.14.0
Release: 8%{?dist} Release: 9%{?dist}
Summary: Generate a list containing all values of a finite type Summary: Generate a list containing all values of a finite type
License: MIT License: MIT
@ -22,9 +18,7 @@ BuildRequires: ocaml >= 4.04.2
BuildRequires: ocaml-base-devel >= 0.14 BuildRequires: ocaml-base-devel >= 0.14
BuildRequires: ocaml-dune >= 2.0.0 BuildRequires: ocaml-dune >= 2.0.0
BuildRequires: ocaml-ppxlib-devel >= 0.11.0 BuildRequires: ocaml-ppxlib-devel >= 0.11.0
%if %{with doc}
BuildRequires: ocaml-odoc BuildRequires: ocaml-odoc
%endif
%description %description
Ppx_enumerate is a ppx rewriter which generates a definition for the Ppx_enumerate is a ppx rewriter which generates a definition for the
@ -45,17 +39,13 @@ files for developing applications that use %{name}.
%build %build
dune build %{?_smp_mflags} dune build %{?_smp_mflags}
%if %{with doc}
dune build %{?_smp_mflags} @doc dune build %{?_smp_mflags} @doc
%endif
%install %install
dune install --destdir=%{buildroot} dune install --destdir=%{buildroot}
%if %{with doc}
# We do not want the dune markers # We do not want the dune markers
find _build/default/_doc/_html -name .dune-keep -delete find _build/default/_doc/_html -name .dune-keep -delete
%endif
# We do not want the ml files # We do not want the ml files
find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
@ -63,11 +53,6 @@ find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
# We install the documentation with the doc macro # We install the documentation with the doc macro
rm -fr %{buildroot}%{_prefix}/doc rm -fr %{buildroot}%{_prefix}/doc
%ifarch %{ocaml_native_compiler}
# Add missing executable bits
find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
%endif
%check %check
dune runtest dune runtest
@ -87,9 +72,7 @@ dune runtest
%endif %endif
%files devel %files devel
%if %{with doc}
%doc _build/default/_doc/_html/* %doc _build/default/_doc/_html/*
%endif
%{_libdir}/ocaml/%{upname}/dune-package %{_libdir}/ocaml/%{upname}/dune-package
%{_libdir}/ocaml/%{upname}/opam %{_libdir}/ocaml/%{upname}/opam
%ifarch %{ocaml_native_compiler} %ifarch %{ocaml_native_compiler}
@ -106,6 +89,10 @@ dune runtest
%{_libdir}/ocaml/%{upname}/runtime-lib/*.cmt %{_libdir}/ocaml/%{upname}/runtime-lib/*.cmt
%changelog %changelog
* Tue Jun 22 2021 Jerry James <loganjerry@gmail.com> - 0.14.0-9
- Rebuild for ocaml-ppxlib 0.22.1
- There is no circular dependency, so build with ocaml-odoc always
* Mon Mar 1 17:34:16 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-8 * Mon Mar 1 17:34:16 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-8
- OCaml 4.12.0 build - OCaml 4.12.0 build
- Make ocaml-odoc dependency conditional. - Make ocaml-odoc dependency conditional.