Rebuild for ocaml-version 3.5.0. Use new OCaml macros.

ocaml-mdx.spec

@@ -1,21 +1,17 @@
 %undefine _package_note_flags
+
 %ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
 %endif
 
-%global srcname mdx
-
-# Break a circular dependency by not building documentation
-%bcond_with doc
-
-Name:           ocaml-%{srcname}
+Name:           ocaml-mdx
 Version:        2.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Executable code blocks inside markdown files
 
 License:        ISC
 URL:            https://realworldocaml.github.io/mdx/
-Source0:        https://github.com/realworldocaml/mdx/releases/download/%{version}/%{srcname}-%{version}.tbz
+Source0:        https://github.com/realworldocaml/mdx/releases/download/%{version}/mdx-%{version}.tbz
 
 BuildRequires:  ocaml >= 4.08.0
 BuildRequires:  ocaml-alcotest-devel
@@ -33,10 +29,6 @@ BuildRequires:  ocaml-re-devel >= 1.7.2
 BuildRequires:  ocaml-result-devel
 BuildRequires:  ocaml-version-devel >= 2.3.0
 
-%if %{with doc}
-BuildRequires:  ocaml-odoc
-%endif
-
 %description
 mdx enables execution of code blocks inside markdown files.  There are
 (currently) two sub-commands, corresponding to two modes of operation:
@@ -71,63 +63,28 @@ The %{name}-devel package contains libraries and signature
 files for developing applications that use %{name}.
 
 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%autosetup -n mdx-%{version} -p1
 
 %build
-dune build %{?_smp_mflags} --release
-
-%if %{with doc}
-dune build %{?_smp_mflags} @doc
-%endif
+%dune_build
 
 %install
-dune install --destdir=%{buildroot}
-
-%if %{with doc}
-# We do not want the dune markers
-find _build/default/_doc/_html -name .dune-keep -delete
-%endif
-
-# We do not want the ml files
-find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
-
-# We install the documentation with the doc macro
-rm -fr %{buildroot}%{_prefix}/doc
+%dune_install
 
 %check
-dune runtest --release
+%dune_check
 
-%files
+%files -f .ofiles
 %doc CHANGES.md README.md
 %license LICENSE.md
-%{_bindir}/ocaml-mdx
-%{_bindir}/ocaml-mdx-test
-%dir %{_libdir}/ocaml/%{srcname}/
-%dir %{_libdir}/ocaml/%{srcname}/test/
-%dir %{_libdir}/ocaml/%{srcname}/top/
-%{_libdir}/ocaml/%{srcname}/META
-%{_libdir}/ocaml/%{srcname}/{,*/}*.cma
-%{_libdir}/ocaml/%{srcname}/{,*/}*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}/{,*/}*.cmxs
-%endif
 
-%files         devel
-%if %{with doc}
-%doc _build/default/_doc/*
-%endif
-%{_libdir}/ocaml/%{srcname}/dune-package
-%{_libdir}/ocaml/%{srcname}/opam
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}/{,*/}*.a
-%{_libdir}/ocaml/%{srcname}/{,*/}*.cmx
-%{_libdir}/ocaml/%{srcname}/{,*/}*.cmxa
-%endif
-%{_libdir}/ocaml/%{srcname}/{,*/}*.cmt
-%{_libdir}/ocaml/%{srcname}/{,*/}*.cmti
-%{_libdir}/ocaml/%{srcname}/{,*/}*.mli
+%files devel -f .ofiles-devel
 
 %changelog
+* Fri Jul  8 2022 Jerry James <loganjerry@gmail.com> - 2.1.0-4
+- Rebuild for ocaml-version 3.5.0
+- Use new OCaml macros
+
 * Sun Jun 19 2022 Richard W.M. Jones <rjones@redhat.com> - 2.1.0-3
 - OCaml 4.14.0 rebuild