Bump and rebuild for updated ocaml-findlib.

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

ocaml-tplib-gmp.patch

@@ -1,11 +0,0 @@
---- ./src/numeric_plugins/mlgmp_plugin.ml.orig	2013-02-14 04:08:25.000000000 -0700
-+++ ./src/numeric_plugins/mlgmp_plugin.ml	2013-02-19 13:56:39.613438907 -0700
-@@ -19,7 +19,7 @@
- 
- *)
- 
--open Gmp
-+open Mlgmp
- 
- let bits_of_string s =
-   let s' = String.sub s 2 ((String.length s)-2) in (* remove prefix "0b" *)

ocaml-tplib-mlgmpidl.patch

@@ -0,0 +1,153 @@
+--- src/numeric_plugins/mlgmp_plugin.ml.orig	2013-02-14 04:08:25.000000000 -0700
++++ src/numeric_plugins/mlgmp_plugin.ml	2017-12-03 14:00:36.471566987 -0700
+@@ -19,48 +19,69 @@
+ 
+ *)
+ 
+-open Gmp
+-
+-let bits_of_string s =
+-  let s' = String.sub s 2 ((String.length s)-2) in (* remove prefix "0b" *)
+-  Z.from_string_base ~base:2 s'
++let randobj = Gmp_random.init_default ();
+ 
+ module Mlgmp_int =
+ struct
+-  type t = Z.t
++  type t = Mpz.t
+ 
+-  let zero = Z.of_int 0
+-  let max x y = if Z.cmp x y >= 0 then x else y
+-  let min x y = if Z.cmp x y >= 0 then y else x
+-  let add = Z.add
+-  let neg = Z.neg
+-  let mul = Z.mul
+-  let div = Z.cdiv_q
+-  let pow = Z.pow_ui
+-  let compare = Z.cmp
++  let zero = Mpz.of_int 0
++  let max x y = if Mpz.cmp x y >= 0 then x else y
++  let min x y = if Mpz.cmp x y >= 0 then y else x
++  let add x y =
++    let res = Mpz.init () in
++    Mpz.add res x y;
++    res
++  let neg x =
++    let res = Mpz.init () in
++    Mpz.neg res x;
++    res
++  let mul x y =
++    let res = Mpz.init () in
++    Mpz.mul res x y;
++    res
++  let div x y =
++    let res = Mpz.init () in
++    Mpz.cdiv_q res x y;
++    res
++  let pow x y =
++    let res = Mpz.init () in
++    Mpz.pow_ui res x y;
++    res
++  let compare = Mpz.cmp
+   let random n =
+-    bits_of_string (Random_generator.to_string n)
+-  let of_int = Z.from_int
+-  let of_string x =
+-    try
+-      Z.from_string_base ~base:10 x
+-    with Invalid_argument _ ->
+-      raise (Failure ("Mpzf.of_string: "^x^" is not well-formatted"))
+-  let to_string = Z.to_string_base ~base:10
++    let res = Mpz.init () in
++    Gmp_random.Mpz.urandomb res randobj n;
++    res
++  let of_int = Mpz.of_int
++  let of_string = Mpz.of_string
++  let to_string = Mpz.get_str ~base:10
+ end
+ 
+ module Mlgmp_rat =
+ struct
+-  type t = Q.t
++  type t = Mpq.t
+ 
+-  let zero = Q.from_int 0
+-  let one = Q.from_int 1
+-  let max x y = if Q.cmp x y >= 0 then x else y
+-  let min x y = if Q.cmp x y >= 0 then y else x
+-  let add = Q.add
+-  let neg = Q.neg
+-  let mul = Q.mul
+-  let div = Q.div
++  let zero = Mpq.of_int 0
++  let one = Mpq.of_int 1
++  let max x y = if Mpq.cmp x y >= 0 then x else y
++  let min x y = if Mpq.cmp x y >= 0 then y else x
++  let add x y =
++    let res = Mpq.init () in
++    Mpq.add res x y;
++    res
++  let neg x =
++    let res = Mpq.init () in
++    Mpq.neg res x;
++    res
++  let mul x y =
++    let res = Mpq.init () in
++    Mpq.mul res x y;
++    res
++  let div x y =
++    let res = Mpq.init () in
++    Mpq.div res x y;
++    res
+ 
+   let pow x n =
+     let rec pow_aux x n =
+@@ -68,31 +89,29 @@ struct
+       if n = 0 then one
+       else
+         let y = pow_aux x (n/2) in
+-        let z = mul y y in
+-        if n mod 2 = 0 then
+-          z
+-        else
+-          mul x z
++        let z = Mpq.init () in
++        Mpq.mul z y y;
++        if n mod 2 != 0 then
++          Mpq.mul z x z;
++        z
+     in
+     if n >= 0 then
+       pow_aux x n
+     else
+-      pow_aux (Q.inv x) (-n)
++      pow_aux (Mpq.inv x x; x) (-n)
+ 
+-  let compare = Q.cmp
++  let compare = Mpq.cmp
+   let random n =
+-    let num = bits_of_string (Random_generator.to_string n) in
+-    let den = bits_of_string (Random_generator.to_string n) in
+-    Q.div (Q.from_z num) (Q.add Q.one (Q.from_z den))
+-  let of_int = Q.from_int
+-  let of_string x =
+-    try
+-      let i = String.index x '/' in
+-      let num = Z.from_string_base ~base:10 (String.sub x 0 i) in
+-      let den = Z.from_string_base ~base:10 (String.sub x (i+1) ((String.length x)-(i+1))) in
+-      Q.div (Q.from_z num) (Q.from_z den)
+-    with Not_found -> Q.from_z (Z.from_string_base ~base:10 x)
+-  let to_string = Q.to_string
++    let num = Mpz.init () in
++    let den = Mpz.init () in
++    Gmp_random.Mpz.urandomb num randobj n;
++    Gmp_random.Mpz.urandomb den randobj n;
++    let res = Mpq.init () in
++    Mpq.div res (Mpq.init_set_z num) (Mpq.add res one (Mpq.init_set_z den); res);
++    res
++  let of_int = Mpq.of_int
++  let of_string = Mpq.of_string
++  let to_string = Mpq.to_string
+ end
+ 
+ let _ =

ocaml-tplib-ocamlbuild.patch

@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2013-02-14 12:08:25.000000000 +0100
++++ Makefile.in	2014-08-28 18:31:03.000000000 +0200
+@@ -31,7 +31,7 @@
+ CP = cp
+ RANLIB = ranlib
+ BUILD_DIR = _build
+-OCAMLBUILD = @OCAMLBUILD@ -ocamlc ocp-ocamlc.opt -ocamlopt ocp-ocamlopt.opt -classic-display -no-links -build-dir $(BUILD_DIR) -use-ocamlfind
++OCAMLBUILD = @OCAMLBUILD@ -classic-display -no-links -build-dir $(BUILD_DIR) -use-ocamlfind
+ OCAMLFIND = @OCAMLFIND@
+ TPLIB = @PACKAGE_NAME@
+ 

ocaml-tplib.spec

@@ -1,10 +1,6 @@
-# Debuginfo generation for OCaml is not yet functional in Fedora
-%global debug_package %{nil}
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
 Name:           ocaml-tplib
 Version:        1.3
-Release:        3%{?dist}
+Release:        61%{?dist}
 Summary:        Tropical Polyhedra Library
 
 License:        LGPLv2+
@@ -19,18 +15,25 @@ Source3:        compute_halfspaces.1
 Source4:        compute_minimal_external_representations.1
 Source5:        compute_tangent_hypergraph.1
 Source6:        compute_tropical_complex.1
+# Upstream patch to adapt to new ocamlbuild behavior.  See
+# https://github.com/ocaml/opam-repository/blob/master/packages/tplib/tplib.1.3/files/fix-makefile.diff
+Patch0:         %{name}-ocamlbuild.patch
+# Adapt to current versions of mlgmpidl
+Patch1:         %{name}-mlgmpidl.patch
 
-BuildRequires:  gmp-devel
+BuildRequires:  make
+BuildRequires:  mpfr-devel
 BuildRequires:  ocaml
+BuildRequires:  ocaml-ocamlbuild-devel
 BuildRequires:  ocaml-camlidl-devel
 BuildRequires:  ocaml-findlib-devel
+BuildRequires:  ocaml-mlgmpidl-devel
+BuildRequires:  ocaml-num-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-zarith-devel
 
-ExclusiveArch:  %{ocaml_arches}
-
 # This is an internal symbol that winds up in Requires, but not Provides
-%global __requires_exclude ocaml\\\(Numeric_plugin\\\)
+%global __requires_exclude ocamlx?\\\(Numeric_plugin\\\)
 
 # Don't advertise the numeric plugins
 %global __provides_exclude plugin
@@ -59,6 +62,18 @@ Tools that use TPLib.
 
 %prep
 %setup -q -n tplib-%{version}
+%patch0
+%patch1
+
+# Enable debuginfo generation
+sed -i 's/@OCAMLBUILD@/& -cflag -g -lflag -g/' Makefile.in
+
+# Use the PIC version of libasmrun
+sed -i 's/-lasmrun/&_pic/g' Makefile.in configure
+sed -i 's/libasmrun\.a/libasmrun_pic.a/' Makefile.in
+
+# Build the bindings with -fPIC
+sed -i 's,CFLAGS += -I\$(OCAML_HOME_DIR),& -fPIC,' Makefile.in
 
 %build
 %configure
@@ -72,20 +87,25 @@ mkdir -p %{buildroot}%{_includedir}
 make install bindir=%{buildroot}%{_bindir} libdir=%{buildroot}%{_libdir} \
   includedir=%{buildroot}%{_includedir}
 
-strip %{buildroot}%{_bindir}/compute*
-strip %{buildroot}%{_libdir}/ocaml/tplib/*.cmxs
-
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
    %{buildroot}%{_mandir}/man1
 
 %check
+# Disable tests on ppc64le for now.  With ocaml 4.09.0, errors like this occur
+# when linking the tests:
+# _build/src/bindings/libtplib_double.a(tplib_double_callback.obj.o): in function `camlStdlib__arg__assoc3_118':
+# (.text+0xe9258): relocation truncated to fit: R_PPC64_TOC16_DS against `.toc'+101d0
+# (.text+0xe9298): relocation truncated to fit: R_PPC64_TOC16_DS against `.toc'+ffe8
+%ifnarch %{power64}
 make test
 _build/tests/test_tplib_double
 _build/tests/test_tplib_rational
+%endif
 
 %files
-%doc LICENSE README
+%doc README
+%license LICENSE
 %{_libdir}/ocaml/tplib/
 %exclude %{_libdir}/ocaml/tplib/*.a
 %exclude %{_libdir}/ocaml/tplib/*.cmxa
@@ -103,6 +123,185 @@ _build/tests/test_tplib_rational
 %doc %{_mandir}/man1/*
 
 %changelog
+* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3-61
+- Bump and rebuild for updated ocaml-findlib.
+
+* Wed Mar  3 2021 Jerry James <loganjerry@gmail.com> - 1.3-60
+- Rebuild for ocaml-zarith 1.12
+
+* Mon Mar  1 17:06:22 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.3-59
+- OCaml 4.12.0 build
+
+* Wed Feb 17 2021 Jerry James <loganjerry@gmail.com> - 1.3-58
+- Bump and rebuild for updated ocaml Dynlink dependency
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-57
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Nov 23 2020 Jerry James <loganjerry@gmail.com> - 1.3-56
+- Rebuild for ocaml-zarith 1.11
+
+* Fri Sep 25 2020 Jerry James <loganjerry@gmail.com> - 1.3-55
+- Rebuild for ocaml-zarith 1.10
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3-54
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3-53
+- OCaml 4.11.0 rebuild
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-52
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-51
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3-50
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3-49
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3-48
+- OCaml 4.11.0 pre-release
+
+* Mon Apr 13 2020 Jerry James <loganjerry@gmail.com> - 1.3-47
+- Exclude ocamlx(Numeric_plugin) from Requires
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3-46
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3-45
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-44
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.3-43
+- OCaml 4.10.0+beta1 rebuild.
+
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3-42
+- OCaml 4.09.0 (final) rebuild.
+
+* Fri Oct 11 2019 Jerry James <loganjerry@gmail.com> - 1.3-41
+- Rebuild for mpfr 4
+
+* Tue Sep  3 2019 Jerry James <loganjerry@gmail.com> - 1.3-40
+- Rebuild for ocaml-zarith 1.9
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3-39
+- OCaml 4.08.1 (final) rebuild.
+
+* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 1.3-38
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-37
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul  4 2019 Jerry James <loganjerry@gmail.com> - 1.3-36
+- Rebuild for ocaml 4.08.0
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-35
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3-33
+- OCaml 4.07.0 (final) rebuild.
+
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.3-32
+- OCaml 4.07.0-rc1 rebuild.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Nov 18 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3-30
+- OCaml 4.06.0 rebuild.
+
+* Wed Aug 09 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3-29
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3-26
+- OCaml 4.04.2 rebuild.
+
+* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 1.3-25
+- OCaml 4.04.1 rebuild.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.3-23
+- rebuild for s390x codegen bug
+
+* Mon Nov 07 2016 Richard W.M. Jones <rjones@redhat.com> - 1.3-22
+- Rebuild for OCaml 4.04.0.
+- Add explicit dependency on ocamlbuild.
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Nov 25 2015 Jerry James <loganjerry@gmail.com> - 1.3-20
+- Rebuild for ocaml-zarith 1.4.1
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3-19
+- OCaml 4.02.3 rebuild.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3-18
+- ocaml-4.02.2 final rebuild.
+
+* Thu Jun 18 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3-17
+- ocaml-4.02.2 rebuild.
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Feb 18 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3-15
+- ocaml-4.02.1 rebuild.
+
+* Tue Oct 14 2014 Jerry James <loganjerry@gmail.com> - 1.3-14
+- Rebuild for ocaml-zarith 1.3
+
+* Fri Sep 19 2014 Jerry James <loganjerry@gmail.com> - 1.3-13
+- Add -ocamlbuild patch to fix build with ocaml 4.02.0
+- Fix license handling
+
+* Sun Aug 24 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3-12
+- Bump release and rebuild.
+
+* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3-11
+- ocaml-4.02.0+rc1 rebuild.
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Aug 02 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3-9
+- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
+
+* Fri Jul 25 2014 Richard W.M. Jones <rjones@redhat.com> - 1.3-8
+- OCaml 4.02.0 beta rebuild.
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Apr 18 2014 Jerry James <loganjerry@gmail.com> - 1.3-6
+- Remove ocaml_arches macro (bz 1087794)
+- Drop unnecessary gmp-devel BR
+
+* Mon Sep 16 2013 Jerry James <loganjerry@gmail.com> - 1.3-5
+- Rebuild for OCaml 4.01.0
+- Enable debuginfo
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri Jun 21 2013 Jerry James <loganjerry@gmail.com> - 1.3-3
 - Rebuild for ocaml-zarith 1.2.1