From f6cae5d0ea5242136103acdf1bbd82dd21692227 Mon Sep 17 00:00:00 2001
From: Dan Čermák <dan.cermak@cgc-instruments.com>
Date: Jul 22 2020 22:24:22 +0000
Subject: New upstream release 1.2.1 (rhbz#1856364)


- rebase 0001-Drop-the-stdlib-shims-subpackage.patch
- include alcotest_engine subpackage in alcotest, as alcotest depends on it

---

diff --git a/.gitignore b/.gitignore
index 03d87de..ceaf58c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /alcotest-*.tbz
 /alcotest-1.1.0.tar.gz
+/alcotest-1.2.1.tar.gz
diff --git a/0001-Drop-the-stdlib-shims-subpackage.patch b/0001-Drop-the-stdlib-shims-subpackage.patch
index 9550f81..afba0f0 100644
--- a/0001-Drop-the-stdlib-shims-subpackage.patch
+++ b/0001-Drop-the-stdlib-shims-subpackage.patch
@@ -1,4 +1,4 @@
-From c21aec01927498729143b5358c88a97d0d08e872 Mon Sep 17 00:00:00 2001
+From 8053d79c56ede986c1d94b9a24d71c822a92be88 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
 Date: Sat, 4 Apr 2020 00:34:23 +0200
 Subject: [PATCH] Drop the stdlib-shims subpackage
@@ -7,13 +7,13 @@ We neither need nor want the stdlib-shims package in Fedora.  It is a forward
 compatibility package for older OCaml installations.  Patch it out instead.
 Upstream does not want this patch until stdlib-shims is obsolete.
 ---
- alcotest.opam     | 1 -
- dune-project      | 3 +--
- src/alcotest/dune | 2 +-
- 3 files changed, 2 insertions(+), 4 deletions(-)
+ alcotest.opam            | 1 -
+ dune-project             | 1 -
+ src/alcotest-engine/dune | 2 +-
+ 3 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/alcotest.opam b/alcotest.opam
-index 0245e17..b8b399f 100644
+index 756782f..3996bb0 100644
 --- a/alcotest.opam
 +++ b/alcotest.opam
 @@ -26,7 +26,6 @@ depends: [
@@ -21,32 +21,31 @@ index 0245e17..b8b399f 100644
    "uuidm"
    "re"
 -  "stdlib-shims"
+   "uutf"
  ]
  build: [
-   ["dune" "subst"] {pinned}
 diff --git a/dune-project b/dune-project
-index ac7db6e..e746ce9 100644
+index 9bccced..f634a31 100644
 --- a/dune-project
 +++ b/dune-project
-@@ -29,8 +29,7 @@ tests to run.
-   astring
+@@ -30,7 +30,6 @@ tests to run.
    cmdliner
    uuidm
--  re
--  stdlib-shims))
-+  re))
+   re
+-  stdlib-shims
+   uutf))
  
  (package
-  (name alcotest-async)
-diff --git a/src/alcotest/dune b/src/alcotest/dune
-index 99b3174..20ba848 100644
---- a/src/alcotest/dune
-+++ b/src/alcotest/dune
-@@ -1,3 +1,3 @@
+diff --git a/src/alcotest-engine/dune b/src/alcotest-engine/dune
+index 9c05d0a..65b33e7 100644
+--- a/src/alcotest-engine/dune
++++ b/src/alcotest-engine/dune
+@@ -1,4 +1,4 @@
  (library
-  (public_name alcotest)
-- (libraries fmt astring cmdliner fmt.cli fmt.tty uuidm re stdlib-shims))
-+ (libraries fmt astring cmdliner fmt.cli fmt.tty uuidm re))
+  (name alcotest_engine)
+  (public_name alcotest.engine)
+- (libraries fmt astring cmdliner fmt.cli uuidm re stdlib-shims uutf))
++ (libraries fmt astring cmdliner fmt.cli uuidm re uutf))
 -- 
-2.25.1
+2.26.2
 
diff --git a/ocaml-alcotest.spec b/ocaml-alcotest.spec
index 3dbc3b8..652cd23 100644
--- a/ocaml-alcotest.spec
+++ b/ocaml-alcotest.spec
@@ -11,8 +11,8 @@
 %global srcname alcotest
 
 Name:           ocaml-%{srcname}
-Version:        1.1.0
-Release:        4%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 Summary:        Lightweight and colorful test framework for OCaml
 
 License:        ISC
@@ -28,9 +28,10 @@ BuildRequires:  ocaml-astring-devel
 BuildRequires:  ocaml-cmdliner-devel
 BuildRequires:  ocaml-dune >= 2.0
 BuildRequires:  ocaml-findlib
-BuildRequires:  ocaml-fmt-devel >= 0.8.6
+BuildRequires:  ocaml-fmt-devel >= 0.8.7
 BuildRequires:  ocaml-re-devel
 BuildRequires:  ocaml-uuidm-devel
+BuildRequires:  ocaml-uutf-devel
 
 %description
 Alcotest is a lightweight and colorful test framework.
@@ -91,8 +92,11 @@ dune runtest -p alcotest
 %{_libdir}/ocaml/%{srcname}/META
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cma
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cmi
+%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cma
+%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmi
 %ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxs
+%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmxs
 %endif
 
 %files devel
@@ -102,12 +106,21 @@ dune runtest -p alcotest
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.a
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cmx
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxa
+%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.a
+%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmx
+%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmxa
 %endif
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cmt
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cmti
 %{_libdir}/ocaml/%{srcname}/*.mli
+%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmt
+%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmti
+%{_libdir}/ocaml/%{srcname}/engine/*.mli
 
 %changelog
+* Wed Jul 22 2020 Dan Čermák <dan.cermak@cgc-instruments.com> - 1.2.1-1
+- New upstream release 1.2.1 (rhbz#1856364)
+
 * Fri Jun 19 2020 Jerry James <loganjerry@gmail.com> - 1.1.0-4
 - Rebuild for ocaml-astring 0.8.4
 
diff --git a/sources b/sources
index e727618..a820bcd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (alcotest-1.1.0.tar.gz) = ee406232897da0132a7ca0e0cd31eda2b6750141db0e5aac94634388107dc5cf4d5fdd4b6bcf1d2979da7102eef13fb8269218f91cfbb2fbfc6468142e2bb9c6
+SHA512 (alcotest-1.2.1.tar.gz) = 4a58f2a52781f9196e1a2bbfc7f433c61d5497e8c1820332663119272110f265423b70cd7cf3ce59d39b121834a63daa9dabfb6ae04f82144ef8d55aff76f6f9