From 5453c499db24d178399790a51260076c5128c813 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 27 Feb 2020 08:53:36 +0000 Subject: [PATCH] Use ounit2. --- ocaml-fileutils-0.5.2-ounit2.patch | 30 ++++++++++++++++++++++++++++++ ocaml-fileutils.spec | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 ocaml-fileutils-0.5.2-ounit2.patch diff --git a/ocaml-fileutils-0.5.2-ounit2.patch b/ocaml-fileutils-0.5.2-ounit2.patch new file mode 100644 index 0000000..96a21e0 --- /dev/null +++ b/ocaml-fileutils-0.5.2-ounit2.patch @@ -0,0 +1,30 @@ +diff -ur ocaml-fileutils-0.5.2.old/setup.ml ocaml-fileutils-0.5.2.new/setup.ml +--- ocaml-fileutils-0.5.2.old/setup.ml 2017-05-23 21:12:33.000000000 +0100 ++++ ocaml-fileutils-0.5.2.new/setup.ml 2020-02-27 08:52:42.964618292 +0000 +@@ -7621,7 +7621,7 @@ + InternalLibrary "fileutils"; + InternalLibrary "fileutils-str"; + FindlibPackage +- ("oUnit", ++ ("ounit2", + Some (OASISVersion.VGreaterEqual "2.0.0")) + ]; + bs_build_tools = [ExternalTool "ocamlbuild"]; +diff -ur ocaml-fileutils-0.5.2.old/_tags ocaml-fileutils-0.5.2.new/_tags +--- ocaml-fileutils-0.5.2.old/_tags 2017-05-23 21:12:33.000000000 +0100 ++++ ocaml-fileutils-0.5.2.new/_tags 2020-02-27 08:52:38.020680545 +0000 +@@ -25,12 +25,12 @@ + : pkg_unix + : use_fileutils + # Executable test +-"test/test.byte": pkg_oUnit ++"test/test.byte": pkg_ounit2 + "test/test.byte": pkg_str + "test/test.byte": pkg_unix + "test/test.byte": use_fileutils + "test/test.byte": use_fileutils-str +-: pkg_oUnit ++: pkg_ounit2 + : pkg_str + : pkg_unix + : use_fileutils diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec index 82bf323..cfc253d 100644 --- a/ocaml-fileutils.spec +++ b/ocaml-fileutils.spec @@ -8,6 +8,8 @@ URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/ Source0: http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.tar.gz Patch1: fileutils-0.5.2-fix-bytes.patch +# Use ounit2. +Patch2: ocaml-fileutils-0.5.2-ounit2.patch BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3