build unpatched, with rpm macros

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-dune?expand=0&rev=49

dune.patch

@@ -1,26 +0,0 @@
-issue #2788
-
---- a/Makefile
-+++ b/Makefile
-@@ -2,6 +2,8 @@ PREFIX_ARG := $(if $(PREFIX),--prefix $(
- LIBDIR_ARG := $(if $(LIBDIR),--libdir $(LIBDIR),)
- DESTDIR_ARG := $(if $(DESTDIR),--destdir $(DESTDIR),)
- INSTALL_ARGS := $(PREFIX_ARG) $(LIBDIR_ARG) $(DESTDIR_ARG)
-+VERBOSE_ARG := $(if $(VERBOSE),--verbose,)
-+INSTALL_ARGS := $(PREFIX_ARG) $(LIBDIR_ARG) $(DESTDIR_ARG) $(VERBOSE_ARG)
- BIN := ./dune.exe
- 
- # Dependencies used for developing and testing dune
-@@ -39,6 +41,12 @@ install:
- uninstall:
- 	$(BIN) uninstall $(INSTALL_ARGS) dune
- 
-+release-with-libraries: release
-+	$(BIN) build @install $(INSTALL_ARGS) --for-release-of-packages='dune,dune-action-plugin,dune-build-info,dune-configurator,dune-glob,dune-private-libs' --build-dir _olh
-+
-+install-with-libraries:
-+	$(BIN) install $(INSTALL_ARGS) dune dune-action-plugin dune-build-info dune-configurator dune-glob dune-private-libs --build-dir _olh
-+
- reinstall: uninstall install
- 
- dev-switch:

ocaml-dune.changes

@@ -3,7 +3,6 @@ Sat Feb 29 20:20:20 UTC 2020 - ohering@suse.de
 
 - update version 2.3.1
   see included CHANGES.md for details
-- add dune.patch
 
 -------------------------------------------------------------------
 Mon Nov 25 12:34:56 UTC 2019 - ohering@suse.de

ocaml-dune.spec

@@ -25,7 +25,6 @@ License:        MIT
 Group:          Development/Languages/OCaml
 Url:            https://opam.ocaml.org/packages/dune
 Source:         %{name}-%{version}.tar.xz
-Patch0:         dune.patch
 Requires:       ocamlfind(compiler-libs)
 BuildRequires:  ocaml(ocaml_base_version) >= 4.07
 BuildRequires:  ocamlfind(compiler-libs)
@@ -48,35 +47,22 @@ developing applications that use %{name}.
 
 %build
 ocaml configure.ml '--libdir=%{ocaml_standard_library}' '--mandir=%{_mandir}'
-if bash -c '
+ocaml bootstrap.ml
-%make_build release-with-libraries
+rm -rfv        '%{_tmppath}/%{name}-%{release}'
-'
+mkdir -vm 0700 '%{_tmppath}/%{name}-%{release}'
-then
+mkdir -vm 0700 '%{_tmppath}/%{name}-%{release}/bin'
-	exit 0
+test -x "$PWD/dune.exe"
-fi
+ln -vs "$_"    '%{_tmppath}/%{name}-%{release}/bin/dune'
-ocamlc -config
+export    "PATH=%{_tmppath}/%{name}-%{release}/bin:$PATH"
-cat _olh/default/otherlibs/configurator/src/flags/flags.sexp
+dune_release_pkgs='dune,dune-action-plugin,dune-build-info,dune-configurator,dune-glob,dune-private-libs'
-exit 1
+%ocaml_dune_setup
+%ocaml_dune_build
 
 %install
-make PREFIX='%{_prefix}' 'LIBDIR=%{ocaml_standard_library}' 'DESTDIR=%{buildroot}' install-with-libraries
+export    "PATH=%{_tmppath}/%{name}-%{release}/bin:$PATH"
-%if 0
-if pushd _boot/default/bin
-then
-  ln -svb main.exe dune
-  export PATH="`readlink -f \"$PWD\"`:$PATH"
-  popd
-fi
-OCAML_DUNE_INSTALL_ARGS='dune --build-dir _boot'
 %ocaml_dune_install
-%else
-rm -rfv %{buildroot}%{_prefix}/doc ; \
-if test -d %{buildroot}%{_prefix}/man ; then \
-	mkdir -vp %{buildroot}%{_datadir} ; \
-	mv -vt %{buildroot}%{_datadir} %{buildroot}%{_prefix}/man ; \
-fi
-%endif
 %ocaml_create_file_list
+rm -rfv        '%{_tmppath}/%{name}-%{release}'
 
 %files -f %{name}.files
 %doc CHANGES.md README.md