diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 08ed870..976bc65 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -26,12 +26,12 @@ Group: Development/Libraries/Other Url: https://forge.ocamlcore.org/projects/ocaml-fileutils/ Source0: ocaml-fileutils-%{version}.tar.xz BuildRequires: ocaml >= 4.00.1 -BuildRequires: ocaml-rpm-macros >= 4.02.1 -BuildRequires: ocamlfind(str) -BuildRequires: ocamlfind(oUnit) -BuildRequires: ocamlfind(unix) BuildRequires: ocaml-oasis BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-rpm-macros >= 4.03 +BuildRequires: ocamlfind(oUnit) +BuildRequires: ocamlfind(str) +BuildRequires: ocamlfind(unix) BuildRoot: %{_tmppath}/%{name}-%{version}-build # ocaml autodep start for pkg: ocaml-fileutils # hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires @@ -65,31 +65,15 @@ developing applications that use %{name}. %build oasis setup -ocaml setup.ml -configure \ - --enable-tests \ - --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 %check -ocaml setup.ml -test +%ocaml_oasis_test %files %defattr(-,root,root,-) @@ -103,6 +87,7 @@ ocaml setup.ml -test %files devel %defattr(-,root,root,-) %doc COPYING.txt AUTHORS.txt CHANGELOG.txt README.txt TODO.txt +%{oasis_docdir_html} %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* %if %{ocaml_native_compiler}