Rebuild for OCaml 4.05 in RHEL 7.5 (RHBZ#1568359)

Add explicit dependency on ocamlbuild.

0001-Safe-string-support.patch

@@ -1,30 +0,0 @@
-From 84ffcbebb71293e419154b0093cfc81f64e885fa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20B=C3=BCnzli?= <daniel.buenzli@erratique.ch>
-Date: Wed, 15 Mar 2017 23:37:03 +0100
-Subject: [PATCH] Safe-string support.
-
-(cherry picked from commit 0e29ed18ce6617a45de478cde07db4c1625c5a64)
----
- _tags       | 2 +-
- opam        | 2 +-
- src/xmlm.ml | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/xmlm.ml b/src/xmlm.ml
-index 1bb8bbc..c97501a 100644
---- a/src/xmlm.ml
-+++ b/src/xmlm.ml
-@@ -960,8 +960,8 @@ struct
-     
-   let make_output ?(decl = true) ?(nl = false) ?(indent = None) 
-       ?(ns_prefix = fun _ ->None) d =
--    let outs, outc = match d with 
--    | `Channel c -> (output c), (output_char c)
-+    let outs, outc = match d with
-+    | `Channel c -> (output_substring c), (output_char c)
-     | `Buffer b -> (Std_buffer.add_substring b), (Std_buffer.add_char b)
-     | `Fun f -> 
-         let os s p l = 
--- 
-2.13.1
-

ocaml-xmlm.spec

@@ -5,27 +5,26 @@
 
 Name:           ocaml-xmlm
 Version:        1.2.0
-Release:        51%{?dist}
+Release:        17%{?dist}
 Summary:        A streaming XML codec
 
 License:        BSD
 URL:            http://erratique.ch/software/xmlm
 Source0:        http://erratique.ch/software/xmlm/releases/xmlm-%{version}.tbz
-
+# Ensure source files are included in generated debuginfo subpackage
+Patch0:         xmlm-1.2.0-debug.patch
 # Example XML files for testing
 Source1:        test-valid.xml
 Source2:        test-invalid.xml
 
-# Ensure source files are included in generated debuginfo subpackage
-Patch0:         xmlm-1.2.0-debug.patch
-
-# Safe-string, cherry-picked from upstream.
-Patch1:         0001-Safe-string-support.patch
-
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib
 BuildRequires:  ocaml-ocamlbuild
 
+%if 0%{?epel}
+ExcludeArch:   ppc64
+%endif
+
 %global libname %(sed -e 's/^ocaml-//' <<< %{name})
 
 %description
@@ -46,7 +45,6 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{libname}-%{version}
 %patch0 -p1 -b .debug
-%patch1 -p1
 
 
 %build
@@ -110,116 +108,12 @@ grep expected invalid-err.log >/dev/null
 
 
 %changelog
-* Mon Mar  1 16:57:44 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-51
-- OCaml 4.12.0 build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-50
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-49
-- OCaml 4.11.1 rebuild
-
-* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-48
-- Rebuild.
-
-* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-47
-- OCaml 4.11.0 rebuild
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-46
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-45
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-44
-- OCaml 4.11.0+dev2-2020-04-22 rebuild
-
-* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-43
-- OCaml 4.11.0 pre-release attempt 2
-
-* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-42
-- OCaml 4.11.0 pre-release
-
-* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-41
-- Update all OCaml dependencies for RPM 4.16.
-
-* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-40
-- OCaml 4.10.0 final.
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-39
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-38
-- OCaml 4.10.0+beta1 rebuild.
-
-* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-37
-- OCaml 4.09.0 for riscv64
-
-* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-36
-- OCaml 4.09.0 (final) rebuild.
-
-* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-35
-- OCaml 4.08.1 (final) rebuild.
-
-* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-34
-- OCaml 4.08.1 (rc2) rebuild.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-32
-- OCaml 4.08.0 (final) rebuild.
-
-* Tue Apr 30 2019 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-31
-- OCaml 4.08.0 (beta 3) rebuild.
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-28
-- OCaml 4.07.0 (final) rebuild.
-
-* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-27
-- OCaml 4.07.0-rc1 rebuild.
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Nov 22 2017 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-25
-- OCaml 4.06.0 rebuild.
-- Fix safe-string for OCaml 4.06.
-
-* Wed Aug 09 2017 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-24
-- OCaml 4.05.0 rebuild.
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-23
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-22
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-21
-- OCaml 4.04.2 rebuild.
-
-* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-20
-- OCaml 4.04.1 rebuild.
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.2.0-18
-- rebuild for s390x codegen bug
-
-* Mon Nov 07 2016 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-17
-- Rebuild for OCaml 4.04.0.
+* Tue Apr 17 2018 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-17
+- Rebuild for OCaml 4.05 in RHEL 7.5 (RHBZ#1568359)
 - Add explicit dependency on ocamlbuild.
 
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+* Tue Sep 29 2015 Ding-Yi Chen <dchen@redhat.com> - 1.2.0-16
+- Exclude ppc64 for EPEL, as ocaml-findlib is not available on it.
 
 * Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.2.0-15
 - OCaml 4.02.3 rebuild.