Version 2.1.0.

- License is ISC, not MIT.
- Trim BuildRequires.

README.md

@@ -1,3 +1,12 @@
 # ocaml-odoc
 
-The ocaml-odoc package
+This package contains [odoc](https://github.com/ocaml/odoc), a documentation
+generator for [OCaml](https://ocaml.org/) and
+[Reason](https://reasonml.github.io/).  It reads doc comments, delimited with
+`(** ... *)`, and outputs HTML.  Text inside doc comments is marked up in
+[ocamldoc syntax](https://ocaml.org/manual/ocamldoc.html).
+
+Odoc's main advantage over ocamldoc is an accurate cross-referencer, which
+handles the complexity of the OCaml module system.  Odoc also offers a good
+opportunity to improve HTML output compared to ocamldoc, but this is very much
+a work in progress.

ocaml-odoc.rpmlintrc

@@ -1,11 +0,0 @@
-# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
-# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
-
-# The dictionary is missing some technical terms
-addFilter(r'W: spelling-error .* (ocamldoc|referencer)')
-
-# OCaml does this to us.  We have no control over it.
-addFilter(r'ocaml-odoc\.[^:]+: E: missing-call-to-chdir-with-chroot')
-
-# Documentation is in the doc subpackage
-addFilter(r'ocaml-odoc-devel\.[^:]+: W: no-documentation')

ocaml-odoc.spec

@@ -1,3 +1,5 @@
+%undefine _package_note_flags
+
 %ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
 %endif
@@ -5,33 +7,37 @@
 %global srcname odoc
 
 Name:           ocaml-%{srcname}
-Version:        1.5.3
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Documentation compiler for OCaml and Reason
 
-License:        MIT
+License:        ISC
 URL:            https://github.com/ocaml/odoc
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
+BuildRequires:  jq-devel
 BuildRequires:  ocaml >= 4.02.0
-BuildRequires:  ocaml-alcotest-devel >= 0.8.3
 BuildRequires:  ocaml-astring-devel
-BuildRequires:  ocaml-bisect-ppx-devel >= 1.3.0
-BuildRequires:  ocaml-cmdliner-devel
-BuildRequires:  ocaml-cppo
-BuildRequires:  ocaml-dune
+BuildRequires:  ocaml-bisect-ppx-devel > 2.5.0
+BuildRequires:  ocaml-bos-devel
+BuildRequires:  ocaml-cmdliner-devel >= 1.0.0
+BuildRequires:  ocaml-cppo >= 1.1.0
+BuildRequires:  ocaml-dune >= 2.9.1
 BuildRequires:  ocaml-findlib
+BuildRequires:  ocaml-fmt-devel
 BuildRequires:  ocaml-fpath-devel
-BuildRequires:  ocaml-markup-devel >= 1.0.0
+BuildRequires:  ocaml-mdx-devel
+BuildRequires:  ocaml-odoc-parser-devel >= 0.9.0
+BuildRequires:  ocaml-ppx-expect-devel
 BuildRequires:  ocaml-result-devel
-BuildRequires:  ocaml-sexplib-devel >= 0.14.0
+BuildRequires:  ocaml-sexplib0-devel
 BuildRequires:  ocaml-tyxml-devel >= 4.3.0
-BuildRequires:  tidy
+BuildRequires:  ocaml-yojson-devel
 
 %description
-This package contains odoc, a documentation generator for OCaml.  It
-reads doc comments, delimited with `(** ... *)`, and outputs HTML.  Text
-inside doc comments is marked up in ocamldoc syntax.
+This package contains odoc, a documentation generator for OCaml and
+Reason.  It reads doc comments, delimited with `(** ... *)`, and outputs
+HTML.  Text inside doc comments is marked up in ocamldoc syntax.
 
 Odoc's main advantage over ocamldoc is an accurate cross-referencer,
 which handles the complexity of the OCaml module system.  Odoc also
@@ -41,8 +47,9 @@ but this is very much a work in progress.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       ocaml-astring-devel%{?_isa}
+Requires:       ocaml-fmt-devel%{?_isa}
 Requires:       ocaml-fpath-devel%{?_isa}
+Requires:       ocaml-odoc-parser-devel%{?_isa}
 Requires:       ocaml-result-devel%{?_isa}
 Requires:       ocaml-tyxml-devel%{?_isa}
 
@@ -60,23 +67,13 @@ Documentation for %{name}.
 %prep
 %autosetup -n %{srcname}-%{version} -p1
 
-# Replace version markers
-for fil in src/html/tree.ml $(find test -name index.html -o -name mld.html); do
-  sed -i.orig 's,%%%%VERSION%%%%,%{version},' $fil
-  touch -r $fil.orig $fil
-  rm $fil.orig
-done
-
 %build
-dune build %{?_smp_mflags}
-dune build %{?_smp_mflags} @doc
+dune build %{?_smp_mflags} --verbose --release
+dune build %{?_smp_mflags} --release @doc
 
 %install
 dune install --destdir=%{buildroot}
 
-# We do not want the test files
-rm -fr %{buildroot}%{_libdir}/ocaml/dune_odoc_test
-
 # We do not want the dune markers
 find _build/default/_doc/_html -name .dune-keep -delete
 
@@ -88,7 +85,7 @@ mkdir -p %{buildroot}%{_mandir}/man1
 _build/install/default/bin/odoc --help groff > %{buildroot}%{_mandir}/man1/odoc.1
 
 %check
-dune runtest
+dune runtest --release
 
 %files
 %doc CHANGES.md README.md
@@ -97,13 +94,18 @@ dune runtest
 %{_datadir}/odoc/
 %{_mandir}/man1/odoc.1*
 %dir %{_libdir}/ocaml/%{srcname}/
-%dir %{_libdir}/ocaml/%{srcname}/compat/
+%dir %{_libdir}/ocaml/%{srcname}/document/
+%dir %{_libdir}/ocaml/%{srcname}/examples/
 %dir %{_libdir}/ocaml/%{srcname}/html/
+%dir %{_libdir}/ocaml/%{srcname}/latex/
 %dir %{_libdir}/ocaml/%{srcname}/loader/
+%dir %{_libdir}/ocaml/%{srcname}/manpage/
 %dir %{_libdir}/ocaml/%{srcname}/model/
+%dir %{_libdir}/ocaml/%{srcname}/model_desc/
+%dir %{_libdir}/ocaml/%{srcname}/ocamlary/
 %dir %{_libdir}/ocaml/%{srcname}/odoc/
-%dir %{_libdir}/ocaml/%{srcname}/parser/
-%dir %{_libdir}/ocaml/%{srcname}/xref/
+%dir %{_libdir}/ocaml/%{srcname}/xref2/
+%dir %{_libdir}/ocaml/%{srcname}/xref_test/
 %{_libdir}/ocaml/%{srcname}/META
 %{_libdir}/ocaml/%{srcname}/*/*.cma
 %{_libdir}/ocaml/%{srcname}/*/*.cmi
@@ -129,6 +131,23 @@ dune runtest
 %license LICENSE.md
 
 %changelog
+* Wed Feb  9 2022 Jerry James <loganjerry@gmail.com> - 2.1.0-1
+- Version 2.1.0
+- License is ISC, not MIT
+- Trim BuildRequires
+
+* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 2.0.2-3
+- OCaml 4.13.1 rebuild to remove package notes
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Jan 17 2022 Jerry James <loganjerry@gmail.com> - 2.0.2-1
+- Version 2.0.2
+
+* Tue Oct 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1.5.3-2
+- OCaml 4.13.1 build
+
 * Wed Aug 11 2021 Jerry James <loganjerry@gmail.com> - 1.5.3-1
 - Version 1.5.3
 

sources

@@ -1 +1 @@
-SHA512 (odoc-1.5.3.tar.gz) = d110568fc0966657e6946ad8d3ab79f9c50d9063c8da875982c646ffc25ef6ed13abf4661b418320cc4b9be920c18ae740bd5d71485ebba6c6fe2ec95f6da5ba
+SHA512 (odoc-2.1.0.tar.gz) = aabc9d4195fc0444eeb64abbe79f8516a5a0ba780ed18ffcae6bb4b6128db6cc6e3dd8865f72df6459c3b1d8466cc8acb5c27cb9d5cb1e3bb57dd115d9e9bd02