Accepting request 736354 from devel:languages:ocaml

- Update to version 1.11.4:
  see included CHANGES.md for details

- use dune macros from ocaml-rpm-macros

- Update to version 1.11.3:
  see included CHANGES.md for details
- Require findlib for ocamlfind, which is used to find ocaml
- Create devel package

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

_service

@@ -1,9 +1,10 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="url">git://github.com/ocaml/dune.git</param>
+    <param name="url">https://github.com/ocaml/dune.git</param>
     <param name="scm">git</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">1.10.0</param>
+    <!-- 1.11.4 -->
+    <param name="revision">a2cef6466c66050223b6944e68f8cdefc88fcc4e</param>
     <param name="filename">ocaml-dune</param>
   </service>
   <service name="recompress" mode="disabled">

ocaml-dune-1.10.0.tar.xz

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

ocaml-dune-1.11.4.tar.xz

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

ocaml-dune.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Oct  9 05:48:16 UTC 2019 - ohering@suse.de
+
+- Update to version 1.11.4:
+  see included CHANGES.md for details
+
+-------------------------------------------------------------------
+Mon Sep 30 12:34:56 UTC 2019 - ohering@suse.de
+
+- use dune macros from ocaml-rpm-macros
+
+-------------------------------------------------------------------
+Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de
+
+- Update to version 1.11.3:
+  see included CHANGES.md for details
+- Require findlib for ocamlfind, which is used to find ocaml
+- Create devel package
+
 -------------------------------------------------------------------
 Thu May 30 15:23:34 UTC 2019 - Andy <andy@onthewings.net>
 

ocaml-dune.spec

@@ -17,7 +17,7 @@
 
 
 Name:           ocaml-dune
-Version:        1.10.0
+Version:        1.11.4
 Release:        0
 %{?ocaml_preserve_bytecode}
 Summary:        A composable build system for OCaml
@@ -28,32 +28,48 @@ Conflicts:      ocaml-jbuilder
 Conflicts:      ocaml-jbuilder-debuginfo
 Conflicts:      ocaml-jbuilder-debugsource
 Source:         %{name}-%{version}.tar.xz
+Requires:       ocaml-findlib
 BuildRequires:  ocaml
+BuildRequires:  ocaml-rpm-macros >= 20191004
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 A composable build system for OCaml
 
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Languages/OCaml
+Requires:       %{name} = %{version}
+
+%description    devel
+The %{name}-devel package contains libraries and signature files for
+developing applications that use %{name}.
+
 %prep
-%setup -q
+%autosetup -p1
 
 %build
-make %{?_smp_mflags} PREFIX=%{_prefix}
+%make_build
 
 %install
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_mandir}/man1
-mkdir -p %{buildroot}%{_mandir}/man5
-cp -av _boot/default/bin/main/main_dune.exe %{buildroot}%{_bindir}/dune
-ln -sfvbn dune %{buildroot}%{_bindir}/jbuilder
-cp -av _boot/default/doc/*.1 %{buildroot}%{_mandir}/man1/
-cp -av _boot/default/doc/*.5 %{buildroot}%{_mandir}/man5/
+#make_install PREFIX='%{_prefix}' LIBDIR="$(ocamlc -where)"
+./_boot/default/bin/main/main_dune.exe install \
+	--prefix '%{_prefix}' \
+	--destdir '%{buildroot}' \
+	--libdir "$(ocamlc -where)" \
+	dune --build-dir _boot
+find '%{buildroot}' -ls
+rm -rfv %{buildroot}%{_prefix}/doc
+mkdir -vp %{buildroot}%{_mandir}
+mv %{buildroot}%{_prefix}/man %{buildroot}%{_datadir}
+%ocaml_create_file_list
 
-%files
-%defattr(-,root,root)
+%files -f %{name}.files
 %doc CHANGES.md README.md
-%license LICENSE.md
 %{_bindir}/*
 %{_mandir}/*/*
+%{_datadir}/emacs
+
+%files devel -f %{name}.files.devel
 
 %changelog