OCaml 4.11.1 rebuild

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

.gitignore

@@ -3,3 +3,6 @@ ocamlgsl-0.6.0.tar.gz
 /gsl-ocaml-1.17.2.tar.gz
 /gsl-ocaml-1.18.1.tar.gz
 /gsl-ocaml-1.18.2.tar.gz
+/gsl-ocaml-1.18.4.tar.gz
+/gsl-ocaml-1.19.0.tar.gz
+/gsl-ocaml-1.19.1.tar.gz

gsl-1.19.1-ocaml45.patch

@@ -0,0 +1,91 @@
+diff -ur gsl-ocaml-1.19.1.old/myocamlbuild.ml gsl-ocaml-1.19.1/myocamlbuild.ml
+--- gsl-ocaml-1.19.1.old/myocamlbuild.ml	2015-11-18 15:14:41.000000000 +0000
++++ gsl-ocaml-1.19.1/myocamlbuild.ml	2017-08-08 21:16:47.090002257 +0100
+@@ -516,7 +516,7 @@
+                  | nm, [], intf_modules ->
+                      ocaml_lib nm;
+                      let cmis =
+-                       List.map (fun m -> (String.uncapitalize m) ^ ".cmi")
++                       List.map (fun m -> (String.uncapitalize_ascii m) ^ ".cmi")
+                                 intf_modules in
+                      dep ["ocaml"; "link"; "library"; "file:"^nm^".cma"] cmis
+                  | nm, dir :: tl, intf_modules ->
+@@ -529,7 +529,7 @@
+                             ["compile"; "infer_interface"; "doc"])
+                        tl;
+                      let cmis =
+-                       List.map (fun m -> dir^"/"^(String.uncapitalize m)^".cmi")
++                       List.map (fun m -> dir^"/"^(String.uncapitalize_ascii m)^".cmi")
+                                 intf_modules in
+                      dep ["ocaml"; "link"; "library"; "file:"^dir^"/"^nm^".cma"]
+                          cmis)
+diff -ur gsl-ocaml-1.19.1.old/setup.ml gsl-ocaml-1.19.1/setup.ml
+--- gsl-ocaml-1.19.1.old/setup.ml	2015-11-18 15:14:41.000000000 +0000
++++ gsl-ocaml-1.19.1/setup.ml	2017-08-08 21:16:34.884995928 +0100
+@@ -315,7 +315,7 @@
+ 
+ 
+   let compare_csl s1 s2 =
+-    String.compare (String.lowercase s1) (String.lowercase s2)
++    String.compare (String.lowercase_ascii s1) (String.lowercase_ascii s2)
+ 
+ 
+   module HashStringCsl =
+@@ -324,10 +324,10 @@
+          type t = string
+ 
+          let equal s1 s2 =
+-             (String.lowercase s1) = (String.lowercase s2)
++             (String.lowercase_ascii s1) = (String.lowercase_ascii s2)
+ 
+          let hash s =
+-           Hashtbl.hash (String.lowercase s)
++           Hashtbl.hash (String.lowercase_ascii s)
+        end)
+ 
+   module SetStringCsl =
+@@ -365,7 +365,7 @@
+           else
+             buf
+         in
+-          String.lowercase buf
++          String.lowercase_ascii buf
+       end
+ 
+ 
+@@ -471,7 +471,7 @@
+         order     = Queue.create ();
+         name_norm =
+           (if case_insensitive then
+-             String.lowercase
++             String.lowercase_ascii
+            else
+              fun s -> s);
+       }
+@@ -1822,13 +1822,13 @@
+   let capitalize_file f =
+     let dir = dirname f in
+     let base = basename f in
+-    concat dir (String.capitalize base)
++    concat dir (String.capitalize_ascii base)
+ 
+ 
+   let uncapitalize_file f =
+     let dir = dirname f in
+     let base = basename f in
+-    concat dir (String.uncapitalize base)
++    concat dir (String.uncapitalize_ascii base)
+ 
+ 
+ end
+@@ -5845,8 +5845,8 @@
+     let make_fnames modul sufx =
+       List.fold_right
+         begin fun sufx accu ->
+-          (String.capitalize modul ^ sufx) ::
+-          (String.uncapitalize modul ^ sufx) ::
++          (String.capitalize_ascii modul ^ sufx) ::
++          (String.uncapitalize_ascii modul ^ sufx) ::
+           accu
+         end
+         sufx

ocaml-gsl.spec

@@ -1,23 +1,35 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%if 0%{?fedora} >= 33
+%global blaslib flexiblas
+%else
+%global blaslib openblas
+%endif
 
 Name:           ocaml-gsl
-Version:        1.18.2
+Version:        1.19.1
-Release:        5%{?dist}
+Release:        34%{?dist}
 Summary:        Interface to GSL (GNU scientific library) for OCaml
 License:        GPLv2
 
-URL:            https://mmottl.github.io/gsl-ocaml/
+# "Architectures with double-word alignment for doubles are not supported"
+# Specifically you should look at this file:
+# %{_libdir}/ocaml/caml/config.h
+# and if it has '#define ARCH_ALIGN_DOUBLE' then it is not supported,
+# but if it has '#undef ARCH_ALIGN_DOUBLE' then it is OK.
+ExcludeArch:    armv7hl
+
+URL:            https://github.com/mmottl/gsl-ocaml
 Source0:        https://github.com/mmottl/gsl-ocaml/releases/download/v%{version}/gsl-ocaml-%{version}.tar.gz
 
-ExcludeArch:    armv7hl sparc64 s390 s390x
+# Various build fixes for OCaml 4.05.0.
+Patch1:         gsl-1.19.1-ocaml45.patch
 
 BuildRequires:  ocaml >= 3.07
+BuildRequires:  ocaml-ocamlbuild
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  gsl-devel >= 1.9
 BuildRequires:  /usr/bin/awk
-BuildRequires:  atlas-devel
+BuildRequires:  %{blaslib}-devel
 
 
 %description
@@ -28,7 +40,6 @@ Objective Caml language.
 %package        devel
 Summary:        Development files for %{name}
 Requires:       %{name} = %{version}-%{release}
-Requires:       /sbin/install-info
 
 
 %description    devel
@@ -39,9 +50,11 @@ developing applications that use %{name}.
 %prep
 %setup -q -n gsl-ocaml-%{version}
 
+%patch1 -p1
+
 
 %build
-export GSL_CBLAS_LIB="-lgsl -L%{_libdir}/atlas -lsatlas"
+export GSL_CBLAS_LIB="-l%{blaslib}"
 make
 
 
@@ -55,7 +68,7 @@ make install
 %files
 %doc COPYING.txt
 %{_libdir}/ocaml/gsl
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/gsl/*.a
 %exclude %{_libdir}/ocaml/gsl/*.cmxs
 %exclude %{_libdir}/ocaml/gsl/*.cmxa
@@ -67,7 +80,7 @@ make install
 
 %files devel
 %doc COPYING.txt AUTHORS.txt CHANGES.txt README.md NOTES.md
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/gsl/*.a
 %{_libdir}/ocaml/gsl/*.cmxs
 %{_libdir}/ocaml/gsl/*.cmxa
@@ -76,6 +89,126 @@ make install
 
 
 %changelog
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-34
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-33
+- OCaml 4.11.0 rebuild
+
+* Fri Aug 14 2020 Iñaki Úcar <iucar@fedoraproject.org> - 1.19.1-32
+- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-30
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-29
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-28
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-27
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-26
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-24
+- OCaml 4.10.0+beta1 rebuild.
+
+* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-23
+- OCaml 4.09.0 for riscv64
+
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-22
+- OCaml 4.09.0 (final) rebuild.
+
+* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 1.19.1-21
+- Rebuilt for GSL 2.6.
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-20
+- OCaml 4.08.1 (final) rebuild.
+
+* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-19
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Aug 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-16
+- Use OpenBLAS on %%{openblas_arches} (RHBZ#1619050).
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-14
+- OCaml 4.07.0 (final) rebuild.
+
+* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-13
+- OCaml 4.07.0-rc1 rebuild.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Sat Nov 18 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-11
+- OCaml 4.06.0 rebuild.
+
+* Tue Aug 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-10
+- OCaml 4.05.0 rebuild.
+- Use ocaml_native_compiler macro instead of opt test.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Mon Jul 31 2017 Florian Weimer <fweimer@redhat.com> - 1.19.1-7
+- Rebuild with binutils fix for ppc64le (#1475636)
+
+* Wed Jul 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-6
+- Rebuild for new gsl 2.4 (thanks: Arthur Mello).
+
+* Tue Jun 27 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-5
+- OCaml 4.04.2 rebuild.
+
+* Sat May 13 2017 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-4
+- OCaml 4.04.1 rebuild.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.19.1-2
+- rebuild for s390x codegen bug
+
+* Mon Nov 07 2016 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-1
+- New upstream version 1.19.1.
+- Add explicit dependency on ocamlbuild.
+
+* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 1.19.0-3
+- Rebuild for gsl 2.1
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Nov 17 2015 Orion Poplawski <orion@cora.nwra.com> - 1.19.0-1
+- Update to 1.19.0 for gsl 2
+
+* Wed Jul 29 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.4-1
+- New upstream version 1.18.4.
+- Exclude armv7hl because it uses double-word alignment for doubles.
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.2-7
+- OCaml 4.02.3 rebuild.
+
+* Mon Jul 27 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.2-6
+- Remove ExcludeArch since bytecode build should now work.
+
 * Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.2-5
 - ocaml-4.02.2 final rebuild.
 

sources

@@ -1 +1 @@
-83239c537c3b2af5f02a8d646ce358d3  gsl-ocaml-1.18.2.tar.gz
+b59a432ac89b49fbd0085d4e17315c50  gsl-ocaml-1.19.1.tar.gz