From f4cc696b26124a68eaa7383a013079913214d5b1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sat, 20 Mar 2021 09:02:17 +0100
Subject: [PATCH] - fix non-opt packaging - rel 3

---
 ocaml-dune.spec | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/ocaml-dune.spec b/ocaml-dune.spec
index c5bcdd7..8e4b520 100644
--- a/ocaml-dune.spec
+++ b/ocaml-dune.spec
@@ -11,7 +11,7 @@
 Summary:	A composable build system for OCaml
 Name:		ocaml-%{module}
 Version:	2.8.4
-Release:	2
+Release:	3
 License:	MIT
 Group:		Libraries
 Source0:	https://github.com/ocaml/dune/archive/%{version}/%{module}-%{version}.tar.gz
@@ -22,12 +22,6 @@ BuildRequires:	ocaml-csexp
 %requires_eq	ocaml-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if %{without ocaml_opt}
-%define		no_install_post_strip	1
-# no opt means no native binary, stripping bytecode breaks such programs
-%define		_enable_debug_packages	0
-%endif
-
 %description
 Dune is a build system designed for OCaml/Reason projects only. It
 focuses on providing the user with a consistent experience and takes
@@ -104,21 +98,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/dune-site/*/*.cma
 %{_libdir}/ocaml/dune-site/*/*.cmi
 %if %{with ocaml_opt}
-%{_libdir}/ocaml/dune*/*.a
-%{_libdir}/ocaml/dune*/*.cmx
-%{_libdir}/ocaml/dune*/*.cmxa
 %{_libdir}/ocaml/dune*/*.cmxs
-%{_libdir}/ocaml/dune-private-libs/*/*.a
-%{_libdir}/ocaml/dune-private-libs/*/*.cmx
-%{_libdir}/ocaml/dune-private-libs/*/*.cmxa
 %{_libdir}/ocaml/dune-private-libs/*/*.cmxs
-%{_libdir}/ocaml/dune-site/*/*.cmx
-%{_libdir}/ocaml/dune-site/*/*.a
-%{_libdir}/ocaml/dune-site/*/*.cmxa
 %{_libdir}/ocaml/dune-site/*/*.cmxs
+%endif
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dllstdune_stubs.so
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dlldune_filesystem_stubs_stubs.so
-%endif
 %{_mandir}/man1/dune*.1*
 %{_mandir}/man5/dune*.5*
 
@@ -138,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/dune-site/*/*.cmti
 %{_libdir}/ocaml/dune-site/*/*.ml
 %{_libdir}/ocaml/dune-site/*/*.mli
-%ifarch %{ocaml_native_compiler}
+%if %{with ocaml_opt}
 %{_libdir}/ocaml/dune*/*.a
 %{_libdir}/ocaml/dune*/*.cmx
 %{_libdir}/ocaml/dune*/*.cmxa
@@ -148,4 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/dune-site/*/*.a
 %{_libdir}/ocaml/dune-site/*/*.cmx
 %{_libdir}/ocaml/dune-site/*/*.cmxa
+%else
+%{_libdir}/ocaml/dune-private-libs/filesystem_stubs/libdune_filesystem_stubs_stubs.a
+%{_libdir}/ocaml/dune-private-libs/stdune/libstdune_stubs.a
 %endif
-- 
2.43.0