From fc123d0e383a7bf787957dde536afcae418a75af65087ff4287215931a4d79e6 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 2 Oct 2019 08:15:09 +0000 Subject: [PATCH] - Move prefix/man to datadir/man to workaround bug in dune (#2670) OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-rpm-macros?expand=0&rev=4 --- ocaml-rpm-macros.changes | 1 + ocaml-rpm-macros.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ocaml-rpm-macros.changes b/ocaml-rpm-macros.changes index 7df37ba..c106a1a 100644 --- a/ocaml-rpm-macros.changes +++ b/ocaml-rpm-macros.changes @@ -7,6 +7,7 @@ Mon Sep 30 14:15:16 UTC 2019 - ohering@suse.de - Provide a ocaml_create_file_list macro - Optional extra args for dune commands - Pass --verbose to dune commands +- Move prefix/man to datadir/man to workaround bug in dune (#2670) ------------------------------------------------------------------- Mon Sep 30 12:34:56 UTC 2019 - ohering@suse.de diff --git a/ocaml-rpm-macros.spec b/ocaml-rpm-macros.spec index 59e285e..b1099f2 100644 --- a/ocaml-rpm-macros.spec +++ b/ocaml-rpm-macros.spec @@ -206,7 +206,11 @@ ocaml setup.ml -configure \\\ ulimit -s $((1024 * 64)) ; \ %endif dune install --verbose --destdir=%%{buildroot} $OCAML_DUNE_INSTALL_ARGS ; \ - rm -rfv %%{buildroot}%%{_prefix}/doc + rm -rfv %%{buildroot}%%{_prefix}/doc ; \ + if test -d %%{buildroot}%%{_prefix}/man ; then \ + mkdir -vp %%{buildroot}%%{_datadir} ; \ + mv -vt %%{buildroot}%%{_datadir} %%{buildroot}%%{_prefix}/man ; \ + fi ; %%ocaml_dune_test \ %ifarch ppc64 ppc64le ulimit -s $((1024 * 64)) ; \