From 1db73ee5d565017c6feef506fa4ac202af4c911b Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Aug 05 2020 17:02:25 +0000
Subject: Version 1.5.1.  Drop upstreamed odoc-1.5.0-ocaml411.patch.


---

diff --git a/ocaml-odoc.spec b/ocaml-odoc.spec
index ab6f9a0..ba1fdc2 100644
--- a/ocaml-odoc.spec
+++ b/ocaml-odoc.spec
@@ -5,17 +5,14 @@
 %global srcname odoc
 
 Name:           ocaml-%{srcname}
-Version:        1.5.0
-Release:        7%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Documentation compiler for OCaml and Reason
 
 License:        MIT
 URL:            https://github.com/ocaml/odoc
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 
-# Fixes sent upstream 2020-04-22
-Patch1:         odoc-1.5.0-ocaml411.patch
-
 BuildRequires:  ocaml >= 4.02.0
 BuildRequires:  ocaml-alcotest-devel >= 0.8.3
 BuildRequires:  ocaml-astring-devel
@@ -27,9 +24,8 @@ BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-fpath-devel
 BuildRequires:  ocaml-markup-devel >= 0.8.0
 BuildRequires:  ocaml-result-devel
-BuildRequires:  ocaml-sexplib-devel
+BuildRequires:  ocaml-sexplib-devel >= 0.14.0
 BuildRequires:  ocaml-tyxml-devel >= 4.3.0
-BuildRequires:  ocaml-uuidm-devel
 BuildRequires:  tidy
 
 %description
@@ -65,7 +61,7 @@ Documentation for %{name}.
 %autosetup -n %{srcname}-%{version} -p1
 
 # The opam file has not been updated since the great renumbering.
-sed -i 's/113\.33\.00/0.13.0/' odoc.opam
+sed -i 's/113\.33\.00/0.14.0/' odoc.opam
 
 # Replace version markers
 for fil in src/html/tree.ml $(find test -name index.html -o -name mld.html); do
@@ -141,6 +137,10 @@ dune runtest
 %license LICENSE.md
 
 %changelog
+* Wed Aug  5 2020 Jerry James <loganjerry@gmail.com> - 1.5.1-1
+- Version 1.5.1
+- Drop upstreamed odoc-1.5.0-ocaml411.patch
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-7
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/odoc-1.5.0-ocaml411.patch b/odoc-1.5.0-ocaml411.patch
deleted file mode 100644
index 3fd4fc7..0000000
--- a/odoc-1.5.0-ocaml411.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur odoc-1.5.0.old/src/loader/cmt.ml odoc-1.5.0.new/src/loader/cmt.ml
---- odoc-1.5.0.old/src/loader/cmt.ml	2020-02-07 19:11:54.000000000 +0000
-+++ odoc-1.5.0.new/src/loader/cmt.ml	2020-04-22 14:13:53.458010790 +0100
-@@ -78,10 +78,6 @@
-         read_pattern env parent doc pat
-     | Tpat_lazy pat ->
-         read_pattern env parent doc pat
--#if OCAML_MAJOR = 4 && OCAML_MINOR >= 08
--    | Tpat_exception pat ->
--        read_pattern env parent doc pat
--#endif
- 
- let read_value_binding env parent vb =
-   let container = (parent : Identifier.Signature.t :> Identifier.LabelParent.t) in
-diff -ur odoc-1.5.0.old/src/loader/doc_attr.ml odoc-1.5.0.new/src/loader/doc_attr.ml
---- odoc-1.5.0.old/src/loader/doc_attr.ml	2020-02-07 19:11:54.000000000 +0000
-+++ odoc-1.5.0.new/src/loader/doc_attr.ml	2020-04-22 14:13:03.597352779 +0100
-@@ -34,7 +34,7 @@
- #if OCAML_MAJOR = 4 && OCAML_MINOR = 02
-         Pexp_constant (Const_string (text, _))
- #else
--        Pexp_constant (Pconst_string (text, _))
-+        Pexp_constant (Pconst_string (text, _, _))
- #endif
-    ; pexp_loc = loc; _}, _); _}] ->
-     Some (text, loc)
diff --git a/sources b/sources
index f5908e2..7765107 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (odoc-1.5.0.tar.gz) = 2facdb46f656b7aa6071035777aa87f9cc02a57cb2d182af56a1d0fd1edb57d760eac658017fa8c3b4ecbe3fe902545fadc1ae9c185a2d8c29bf6a228ac9ca29
+SHA512 (odoc-1.5.1.tar.gz) = 80ed9ef7d1f2a6adf63922811913baa04bec44f61652ba61406d32bfd09b6009e9918cf58d0944291441b1e79584ef6c6ca7ed0aed7d6de3c7381884363210d7