Accepting request 777975 from devel:languages:ocaml

- Update to version 2.2.2
  Don't follow symlink in bracket_tmpdir removal code
- Remove ounit-strict-formats.diff
- Require current ocaml-rpm-macros
- Build conditionally with ocaml-lwt

- Require current dune macros

- use dune macros from ocaml-rpm-macros

- Update to version 2.2.1

OBS-URL: https://build.opensuse.org/request/show/777975
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-ounit?expand=0&rev=3

_service

@@ -0,0 +1,14 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/gildor478/ounit.git</param>
+    <param name="scm">git</param>
+    <param name="versionformat">2.2.2</param>
+    <param name="revision">v2.2.2</param>
+    <param name="filename">ocaml-ounit</param>
+  </service>
+  <service name="recompress" mode="disabled">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="set_version" mode="disabled"/>
+</services>

ocaml-ounit-2.2.2.tar.xz

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

ocaml-ounit.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de
+
+- Update to version 2.2.2
+  Don't follow symlink in bracket_tmpdir removal code
+- Remove ounit-strict-formats.diff
+- Require current ocaml-rpm-macros
+- Build conditionally with ocaml-lwt
+
+-------------------------------------------------------------------
+Fri Nov  1 12:34:56 UTC 2019 - ohering@suse.de
+
+- Require current dune macros
+
+-------------------------------------------------------------------
+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 2.2.1
+
 -------------------------------------------------------------------
 Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
 

ocaml-ounit.spec

@@ -12,25 +12,33 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+%bcond_with     ocaml_lwt
+
 Name:           ocaml-ounit
-Version:        2.0.0
+Version:        2.2.2
 Release:        0
 %{?ocaml_preserve_bytecode}
 Summary:        Ocaml OUnit test framework
 License:        MIT
 Group:          Development/Languages/OCaml
-Url:            http://ounit.forge.ocamlcore.org/
+Url:            https://github.com/gildor478/ounit
-Source0:        ounit-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.xz
-Patch0:         ounit-strict-formats.diff
 BuildRequires:  ocaml
-BuildRequires:  ocaml-oasis
+BuildRequires:  ocaml-dune
-BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ocaml-rpm-macros >= 20200220
-BuildRequires:  ocaml-rpm-macros >= 4.03
+BuildRequires:  ocamlfind(bytes)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  ocamlfind(stdlib-shims)
+BuildRequires:  ocamlfind(str)
+BuildRequires:  ocamlfind(threads)
+BuildRequires:  ocamlfind(unix)
+%if %{with ocaml_lwt}
+BuildRequires:  ocamlfind(lwt)
+BuildRequires:  ocamlfind(lwt.unix)
+%endif
 
 %description
 OUnit is a unit test framework for OCaml. It allows one to easily
@@ -47,44 +55,28 @@ Requires:       %{name} = %{version}
 Development files needed for application based on %{name}.
 
 %prep
-%setup -q -n ounit-%{version}
+%autosetup -p1
-%patch0 -p1
 
 %build
-%oasis_setup
+dune_release_pkgs='ounit,ounit2'
-%ocaml_oasis_configure --enable-docs
+%if %{with ocaml_lwt}
-%ocaml_oasis_build
+dune_release_pkgs="${dune_release_pkgs},ounit-lwt,ounit2-lwt"
-%ocaml_oasis_doc
+%endif
+%ocaml_dune_setup
+%ocaml_dune_build
 
 %install
-%ocaml_oasis_findlib_install
+%ocaml_dune_install
+mkdir %{buildroot}$(ocamlc -where)/oUnit
+cp -avt "$_" src/lib/oUnit/META
+%ocaml_create_file_list
 
-%files
+%check
-%defattr(-,root,root,-)
+%ocaml_dune_test
-%doc LICENSE.txt
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
 
-%files devel
+%files -f %{name}.files
-%defattr(-,root,root,-)
+%doc README.md
-%{oasis_docdir_html}
+
-%dir %{_libdir}/ocaml
+%files devel -f %{name}.files.devel
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.annot
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmt
-%{_libdir}/ocaml/*/*.cmti
-%{_libdir}/ocaml/*/*.ml
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/META
 
 %changelog

ounit-2.0.0.tar.gz

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

ounit-strict-formats.diff

@@ -1,31 +0,0 @@
-http://forge.ocamlcore.org/tracker/index.php?func=detail&aid=1422&group_id=162&atid=732
-diff -r -u ounit.2.0.0.orig/src/oUnitLoggerHTML.ml ounit.2.0.0/src/oUnitLoggerHTML.ml
---- ounit.2.0.0.orig/src/oUnitLoggerHTML.ml	2013-09-30 02:22:18.000000000 +0200
-+++ ounit.2.0.0/src/oUnitLoggerHTML.ml	2014-09-03 00:29:39.000000000 +0200
-@@ -198,22 +198,22 @@
-     <div class='ounit-test %s'>
-       <h2>%s (%s)</h2>
-       <div class='ounit-started-at'>Started at: %s</div>
--      <div class='ounit-duration'>Test duration: %0.3fs</div>
-+      <div class='ounit-duration'>Test duration: %.3fs</div>
-       <div class='ounit-log'>\n"
-          class_result
-          (html_escaper test_data.test_name)
-          (html_escaper text_result)
-          (date_iso8601 test_data.timestamp_start)
-          (test_data.timestamp_end -. test_data.timestamp_start);
--       printf "<span class='ounit-timestamp'>%0.3fs</span>Start<br/>\n"
-+       printf "<span class='ounit-timestamp'>%.3fs</span>Start<br/>\n"
-          0.0;
-        List.iter (fun (tmstp, svrt, str) ->
-                     printf "\
-         <span class='%s'>
--          <span class='ounit-timestamp'>%0.3fs</span>%s</span><br/>\n"
-+          <span class='ounit-timestamp'>%.3fs</span>%s</span><br/>\n"
-                       (class_severity_opt svrt) tmstp (html_escaper str))
-          test_data.log_entries;
--       printf "<span class='ounit-timestamp'>%0.3fs</span>End<br/>\n"
-+       printf "<span class='ounit-timestamp'>%.3fs</span>End<br/>\n"
-          (test_data.timestamp_end -. test_data.timestamp_start);
-        printf "<div class='ounit-result'>";
-        begin