Accepting request 782576 from devel:languages:ocaml

- update version 2.4.0
  see included CHANGES.md for details

OBS-URL: https://build.opensuse.org/request/show/782576
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-dune?expand=0&rev=16

_service

@@ -1,11 +1,13 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/ocaml/dune.git</param>
-    <param name="scm">git</param>
-    <param name="versionformat">@PARENT_TAG@</param>
-    <!-- 1.11.4 -->
-    <param name="revision">a2cef6466c66050223b6944e68f8cdefc88fcc4e</param>
     <param name="filename">ocaml-dune</param>
+    <param name="revision">ccd447e41a711f8a52bc854d71dba8677c900c34</param>
+    <param name="scm">git</param>
+    <param name="submodules">disable</param>
+    <param name="url">https://github.com/ocaml/dune.git</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionrewrite-pattern">[v]?([^\+]+)(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>

ocaml-dune-1.11.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89060fee4b6b42d5a6e50640ab12f4ac018191d001890538d674222534fdba26
-size 628060

ocaml-dune-2.4.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0251d9855b43e74ae806d9f718889a38f101d6f16c2932e6ae65e79e956a2408
+size 912696

ocaml-dune.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Feb 29 20:20:20 UTC 2020 - ohering@suse.de
+
+- update version 2.4.0
+  see included CHANGES.md for details
+
 -------------------------------------------------------------------
 Mon Nov 25 12:34:56 UTC 2019 - ohering@suse.de
 

ocaml-dune.spec

@@ -17,21 +17,18 @@
 
 
 Name:           ocaml-dune
-Version:        1.11.4
+Version:        2.4.0
 Release:        0
 %{?ocaml_preserve_bytecode}
 Summary:        A composable build system for OCaml
 License:        MIT
 Group:          Development/Languages/OCaml
-Url:            https://dune.build/
+Url:            https://opam.ocaml.org/packages/dune
-Conflicts:      ocaml-jbuilder
-Conflicts:      ocaml-jbuilder-debuginfo
-Conflicts:      ocaml-jbuilder-debugsource
 Source:         %{name}-%{version}.tar.xz
 Requires:       ocamlfind(compiler-libs)
-BuildRequires:  ocaml(ocaml_base_version) < 4.06
+BuildRequires:  ocaml(ocaml_base_version) >= 4.07
 BuildRequires:  ocamlfind(compiler-libs)
-BuildRequires:  ocaml-rpm-macros >= 20191101
+BuildRequires:  ocaml-rpm-macros >= 20200220
 
 %description
 A composable build system for OCaml
@@ -49,20 +46,23 @@ developing applications that use %{name}.
 %autosetup -p1
 
 %build
-ocaml configure.ml --libdir=$(ocamlc -where)
+ocaml configure.ml '--libdir=%{ocaml_standard_library}' '--mandir=%{_mandir}'
-%make_build
+ocaml bootstrap.ml
+rm -rfv        '%{_tmppath}/%{name}-%{release}'
+mkdir -vm 0700 '%{_tmppath}/%{name}-%{release}'
+mkdir -vm 0700 '%{_tmppath}/%{name}-%{release}/bin'
+test -x "$PWD/dune.exe"
+ln -vs "$_"    '%{_tmppath}/%{name}-%{release}/bin/dune'
+export    "PATH=%{_tmppath}/%{name}-%{release}/bin:$PATH"
+dune_release_pkgs='dune,dune-action-plugin,dune-build-info,dune-configurator,dune-glob,dune-private-libs'
+%ocaml_dune_setup
+%ocaml_dune_build
 
 %install
-#make_install PREFIX='%{_prefix}' LIBDIR="$(ocamlc -where)"
+export    "PATH=%{_tmppath}/%{name}-%{release}/bin:$PATH"
-if pushd _boot/default/bin/main
-then
-  ln -svb main_dune.exe dune
-  export PATH="`readlink -f \"$PWD\"`:$PATH"
-  popd
-fi
-OCAML_DUNE_INSTALL_ARGS='dune --build-dir _boot'
 %ocaml_dune_install
 %ocaml_create_file_list
+rm -rfv        '%{_tmppath}/%{name}-%{release}'
 
 %files -f %{name}.files
 %doc CHANGES.md README.md