From bf2004ccc7850e7a33124be8334380fd073a2dfc Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Tue, 14 Jan 2020 12:19:00 -0700
Subject: [PATCH] Version 1.0.0.

---
 ocaml-alcotest-stdlib-shims.patch | 17 +++++++++++++++++
 ocaml-alcotest.spec               | 23 +++++++++++++++--------
 sources                           |  2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)
 create mode 100644 ocaml-alcotest-stdlib-shims.patch

diff --git a/ocaml-alcotest-stdlib-shims.patch b/ocaml-alcotest-stdlib-shims.patch
new file mode 100644
index 0000000..3c8e01a
--- /dev/null
+++ b/ocaml-alcotest-stdlib-shims.patch
@@ -0,0 +1,17 @@
+--- a/alcotest.opam
++++ b/alcotest.opam
+@@ -22,7 +22,6 @@ depends: [
+   "cmdliner"
+   "uuidm"
+   "re"
+-  "stdlib-shims"
+ ]
+ 
+ synopsis: "Alcotest is a lightweight and colourful test framework"
+--- a/src/alcotest/dune
++++ b/src/alcotest/dune
+@@ -1,3 +1,3 @@
+ (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))
diff --git a/ocaml-alcotest.spec b/ocaml-alcotest.spec
index 526d7b3..8ae62a0 100644
--- a/ocaml-alcotest.spec
+++ b/ocaml-alcotest.spec
@@ -11,21 +11,25 @@
 %global srcname alcotest
 
 Name:           ocaml-%{srcname}
-Version:        0.8.5
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        Lightweight and colorful test framework for OCaml
 
 License:        ISC
 URL:            https://github.com/mirage/alcotest
 Source0:        %{url}/releases/download/%{version}/%{srcname}-%{version}.tbz
+# 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.
+Patch0:         %{name}-stdlib-shims.patch
 
-BuildRequires:  ocaml >= 4.02.3
+BuildRequires:  ocaml >= 4.03.0
 BuildRequires:  ocaml-astring-devel
 BuildRequires:  ocaml-cmdliner-devel
 BuildRequires:  ocaml-dune >= 1.1.0
 BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-fmt-devel >= 0.8.0
-BuildRequires:  ocaml-result-devel
+BuildRequires:  ocaml-re-devel
 BuildRequires:  ocaml-uuidm-devel
 
 %description
@@ -46,18 +50,18 @@ Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       ocaml-cmdliner-devel%{?_isa}
 Requires:       ocaml-fmt-devel%{?_isa}
-Requires:       ocaml-result-devel%{?_isa}
+Requires:       ocaml-re-devel%{?_isa}
 
 %description    devel
 The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -n %{srcname}-%{version} -p1
 
 %build
 # For non-bootstrap builds, omit the "-p alcotest", and also run:
-#   dune build -p alcotest @doc
+#   dune build @doc
 # to generate the documentation.
 dune build -p alcotest
 
@@ -97,9 +101,12 @@ dune runtest -p alcotest
 %endif
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cmt
 %{_libdir}/ocaml/%{srcname}/%{srcname}*.cmti
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.ml
-%{_libdir}/ocaml/%{srcname}/%{srcname}*.mli
+%{_libdir}/ocaml/%{srcname}/*.ml
+%{_libdir}/ocaml/%{srcname}/*.mli
 
 %changelog
+* Tue Jan 14 2020 Jerry James <loganjerry@gmail.com> - 1.0.0-1
+- Version 1.0.0
+
 * Thu Jan  9 2020 Jerry James <loganjerry@gmail.com> - 0.8.5-1
 - Initial RPM
diff --git a/sources b/sources
index e17a3a1..3f0981f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (alcotest-0.8.5.tbz) = 2d4aaec0a382fb4a883b3dc127e5a62272ecc721f6a1cc0bfe3aebba8bf76efc4bce2e097b2043a8b4b618323162f18d34b610ea8c12787c15210724a7523fa3
+SHA512 (alcotest-1.0.0.tbz) = 3c9dffbb5064cf3e9995110628c7fdf466651e9e022addc8eb1c79585863112a195c254994eb8f8384e183c9e2d9c946e28dcd4b1cac7ca48114a478de2362c0