diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec index d084a3f..c380da4 100644 --- a/ocaml-ounit.spec +++ b/ocaml-ounit.spec @@ -29,7 +29,7 @@ Patch0: ounit-strict-formats.diff BuildRequires: ocaml BuildRequires: ocaml-oasis BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.02.1 +BuildRequires: ocaml-rpm-macros >= 4.03 BuildRoot: %{_tmppath}/%{name}-%{version}-build # ocaml autodep start for pkg: ocaml-ounit # hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires @@ -64,26 +64,12 @@ Development files needed for application based on %{name}. %build oasis setup -ocaml setup.ml -configure \ - --bindir '%{_bindir}' \ - --mandir '%{_mandir}' \ - --destdir '%{buildroot}' \ - --datarootdir '%{_datadir}' \ - --libdir '%{_libdir}' \ - --libexecdir '%{_libexecdir}' \ - --localstatedir '%{_localstatedir}' \ - --sbindir '%{_sbindir}' \ - --prefix '%{_prefix}' \ - --sysconfdir '%{_sysconfdir}' \ - --exec-prefix '%{_exec_prefix}' \ - --sharedstatedir '%{_sharedstatedir}' - -ocaml setup.ml -build +%ocaml_oasis_configure --enable-docs +%ocaml_oasis_build +%ocaml_oasis_doc %install -export OCAMLFIND_DESTDIR=%{buildroot}`ocamlc -where` -mkdir -p $OCAMLFIND_DESTDIR -ocaml setup.ml -install +%ocaml_oasis_findlib_install %files %defattr(-,root,root,-) @@ -96,6 +82,7 @@ ocaml setup.ml -install %files devel %defattr(-,root,root,-) +%{oasis_docdir_html} %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* %if %{ocaml_native_compiler}