From bb9be23cc80635e7e37a7be06093f799766e2876 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 1 Mar 2021 21:03:40 +0000 Subject: [PATCH] New upstream version 2.2.4. - Update patches. --- .gitignore | 1 + ...ecommend-to-install-ounit2-with-opam.patch | 25 -------------- ...ms.patch => 0001-Remove-stdlib-shims.patch | 8 ++--- 0002-Fix-english-typo.patch | 34 ------------------- 0004-Patch-out-failing-test.patch | 34 ------------------- ocaml-ounit.spec | 18 ++++------ sources | 2 +- 7 files changed, 12 insertions(+), 110 deletions(-) delete mode 100644 0001-Recommend-to-install-ounit2-with-opam.patch rename 0003-Remove-stdlib-shims.patch => 0001-Remove-stdlib-shims.patch (87%) delete mode 100644 0002-Fix-english-typo.patch delete mode 100644 0004-Patch-out-failing-test.patch diff --git a/.gitignore b/.gitignore index 8b1de5c..00a90bc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ounit-1.0.3.tar.gz /ounit-2.0.6.tar.gz /ounit-2.0.8.tar.gz /ounit-v2.2.2.tbz +/ounit-v2.2.4.tbz diff --git a/0001-Recommend-to-install-ounit2-with-opam.patch b/0001-Recommend-to-install-ounit2-with-opam.patch deleted file mode 100644 index 8afe5f3..0000000 --- a/0001-Recommend-to-install-ounit2-with-opam.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0b117f7567f7f55dc4aa48bb2fe3a517296626db Mon Sep 17 00:00:00 2001 -From: Sylvain Le Gall -Date: Sat, 25 Jan 2020 07:32:53 +0100 -Subject: [PATCH 1/4] Recommend to install ounit2 with opam. - ---- - README.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/README.md b/README.md -index 7489003..27455be 100644 ---- a/README.md -+++ b/README.md -@@ -23,7 +23,7 @@ Installation - The recommended way to install ounit is via the [opam package manager][opam]: - - ```sh --$ opam install ounit -+$ opam install ounit2 - ``` - - Documentation --- -2.24.1 - diff --git a/0003-Remove-stdlib-shims.patch b/0001-Remove-stdlib-shims.patch similarity index 87% rename from 0003-Remove-stdlib-shims.patch rename to 0001-Remove-stdlib-shims.patch index c335ed0..9426ef5 100644 --- a/0003-Remove-stdlib-shims.patch +++ b/0001-Remove-stdlib-shims.patch @@ -1,7 +1,7 @@ -From 601414b2775f5cd148681d6093c8ef0cc94a9b61 Mon Sep 17 00:00:00 2001 +From fec0a725231d5769b3d3454687d6b0e1bd6b5e58 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 May 2020 12:30:50 +0100 -Subject: [PATCH 3/4] Remove stdlib-shims. +Subject: [PATCH] Remove stdlib-shims. We neither need nor want the stdlib-shims package in Fedora. It is a forward compatibility package for older OCaml installations. Patch it @@ -13,7 +13,7 @@ obsolete. 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ounit2.opam b/ounit2.opam -index 5a03ec6..d07b9e8 100644 +index d07d8ca..2ae6fe9 100644 --- a/ounit2.opam +++ b/ounit2.opam @@ -10,7 +10,6 @@ depends: [ @@ -35,5 +35,5 @@ index df87fe1..529a7e4 100644 - (libraries unix bytes stdlib-shims)) + (libraries unix bytes)) -- -2.24.1 +2.29.2 diff --git a/0002-Fix-english-typo.patch b/0002-Fix-english-typo.patch deleted file mode 100644 index e429205..0000000 --- a/0002-Fix-english-typo.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4ccf89e1a2570cefe504682dfb1213613b6dc0bb Mon Sep 17 00:00:00 2001 -From: Sylvain Le Gall -Date: Wed, 18 Mar 2020 08:31:29 +0100 -Subject: [PATCH 2/4] Fix english typo. - ---- - src/lib/ounit2/advanced/oUnitCheckEnv.ml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/ounit2/advanced/oUnitCheckEnv.ml b/src/lib/ounit2/advanced/oUnitCheckEnv.ml -index 5294e6e..f3cc417 100644 ---- a/src/lib/ounit2/advanced/oUnitCheckEnv.ml -+++ b/src/lib/ounit2/advanced/oUnitCheckEnv.ml -@@ -94,7 +94,7 @@ let check test_ctxt t = - [ - (fun () -> - assert_equal -- ~msg:"Check that the current working dir hasn't change during the \ -+ ~msg:"Check that the current working dir hasn't changed during the \ - test." - ~printer:(fun s -> s) - t.pwd -@@ -102,7 +102,7 @@ let check test_ctxt t = - (fun () -> - let convert t = SetEnv.of_list (Array.to_list t.env) in - SetEnv.assert_equal -- ~msg:"Check that the environment variables haven't change during \ -+ ~msg:"Check that the environment variables haven't changed during \ - the test." - (convert t) - (convert t')); --- -2.24.1 - diff --git a/0004-Patch-out-failing-test.patch b/0004-Patch-out-failing-test.patch deleted file mode 100644 index e413037..0000000 --- a/0004-Patch-out-failing-test.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6b4b0e64176d59d8836e1042197247aef06d9d2c Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Tue, 5 May 2020 12:31:13 +0100 -Subject: [PATCH 4/4] Patch out failing test. - -Reported upstream: -https://github.com/gildor478/ounit/issues/17 ---- - test/testOtherTests.ml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/testOtherTests.ml b/test/testOtherTests.ml -index 1292d5a..a5d3666 100644 ---- a/test/testOtherTests.ml -+++ b/test/testOtherTests.ml -@@ -146,7 +146,7 @@ let tests = - Some ("src/oUnitRunner.ml", 14); - ]); - -- -+(* - "AssertCodePosition" >:: - (fun ctxt -> - skip_if (not (Printexc.backtrace_status ())) "No backtrace."; -@@ -171,5 +171,5 @@ let tests = - let fn_exp = "test/testOtherTests.ml" in - assert_equal ~printer:(fun s -> s) fn_exp fn1; - assert_equal ~printer:(fun s -> s) fn_exp fn2; -- assert_equal ~printer:string_of_int 3 (lineno2 - lineno1)); -+ assert_equal ~printer:string_of_int 3 (lineno2 - lineno1)); *) - ] --- -2.24.1 - diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec index 13ec91b..17ad6ad 100644 --- a/ocaml-ounit.spec +++ b/ocaml-ounit.spec @@ -10,24 +10,16 @@ %bcond_with doc Name: ocaml-%{srcname} -Version: 2.2.2 -Release: 15%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Summary: Unit test framework for OCaml License: MIT URL: https://github.com/gildor478/ounit Source0: %{url}/releases/download/v%{version}/%{srcname}-v%{version}.tbz -# Patches upstream since 2.2.2 was released: -Patch0001: 0001-Recommend-to-install-ounit2-with-opam.patch -Patch0002: 0002-Fix-english-typo.patch - # Remove stdlib-shims downstream. Not needed in Fedora. -Patch0003: 0003-Remove-stdlib-shims.patch - -# Patch out a failing test. -# https://github.com/gildor478/ounit/issues/17 -Patch0004: 0004-Patch-out-failing-test.patch +Patch0001: 0001-Remove-stdlib-shims.patch BuildRequires: ocaml >= 4.02.3 BuildRequires: ocaml-dune >= 1.11.0 @@ -209,7 +201,9 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+ %changelog -* Mon Mar 1 17:33:35 GMT 2021 Richard W.M. Jones - 2.2.2-15 +* Mon Mar 1 17:33:35 GMT 2021 Richard W.M. Jones - 2.2.4-15 +- New upstream version 2.2.4. +- Update patches. - OCaml 4.12.0 build * Mon Feb 22 2021 Jerry James - 2.2.2-14 diff --git a/sources b/sources index 423de0b..a66c308 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ounit-v2.2.2.tbz) = 24c56141c9063c81e9cd193f9b927f01766e344bd8fbddd702fe1a2765e1bf626082d7b0b29704e1c86ce6eb67493d1f70c0a454e39c6e79209820d0e60db9bd +SHA512 (ounit-v2.2.4.tbz) = d69dc501a360c31f7854322b5e2c2abcb1e43890737e1cc00c167ee104d5dee471b6b8d8186f8044b0482c91a8f15210a25d833a1e03ed7baabfba923815962f