From ed8069994c75d57153ab95cf92d4b68efed7305c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Oct 05 2023 03:53:29 +0000 Subject: Use the %ocaml_install macro --- diff --git a/ocaml-mtime.spec b/ocaml-mtime.spec index b189c89..04fa3b5 100644 --- a/ocaml-mtime.spec +++ b/ocaml-mtime.spec @@ -11,8 +11,10 @@ URL: https://erratique.ch/software/mtime Source0: %{url}/releases/mtime-%{version}.tbz BuildRequires: ocaml >= 4.08.0 +BuildRequires: ocaml-compiler-libs BuildRequires: ocaml-findlib BuildRequires: ocaml-ocamlbuild +BuildRequires: ocaml-rpm-macros BuildRequires: ocaml-topkg-devel >= 1.0.3 BuildRequires: python3 @@ -48,27 +50,7 @@ echo $'\ntrue: cclib(-lm)' >> _tags ocaml pkg/pkg.ml build --dev-pkg false --tests true %install -mkdir -p %{buildroot}%{_libdir}/ocaml/mtime/clock/os -mkdir -p %{buildroot}%{_libdir}/ocaml/mtime/top -%ifarch %{ocaml_native_compiler} -cp -p _build/src/mtime.{a,cmx,cmxa,cmxs} %{buildroot}%{_libdir}/ocaml/mtime -cp -p _build/src-clock/*.{cmx,cmxa,cmxs} \ - %{buildroot}%{_libdir}/ocaml/mtime/clock/os -cp -p _build/src/mtime_top.{cmx,cmxa,cmxs} \ - %{buildroot}%{_libdir}/ocaml/mtime/top -%endif -cp -p _build/src/mtime.{cma,cmi,cmt,cmti,mli} _build/pkg/META _build/opam \ - %{buildroot}%{_libdir}/ocaml/mtime -cp -p _build/src-clock/*.{a,cma,cmi,cmt,cmti,js,mli} \ - %{buildroot}%{_libdir}/ocaml/mtime/clock/os -cp -p _build/src/mtime_top.{cma,cmi,cmt} %{buildroot}%{_libdir}/ocaml/mtime/top -cp -p _build/src/mtime_top_init.ml %{buildroot}%{_libdir}/ocaml/mtime -mkdir -p %{buildroot}%{_libdir}/ocaml/stublibs -cp -p _build/src-clock/*.so %{buildroot}%{_libdir}/ocaml/stublibs -%ocaml_files - -# The clock directory is mistakenly labeled as a devel directory -sed -i '/%dir/d' .ofiles-devel +%ocaml_install %check ocaml pkg/pkg.ml test @@ -76,7 +58,6 @@ ocaml pkg/pkg.ml test %files -f .ofiles %doc CHANGES.md README.md %license LICENSE.md -%dir %{ocamldir}/mtime/clock %files devel -f .ofiles-devel %if %{with docs} @@ -84,6 +65,9 @@ ocaml pkg/pkg.ml test %endif %changelog +* Wed Sep 27 2023 Jerry James - 2.0.0-3 +- Use the %%ocaml_install macro + * Thu Jul 20 2023 Fedora Release Engineering - 2.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild