OCaml 4.10.0 final (Fedora 32).

2020-02-27 15:02:56 +00:00
1 changed files with 13 additions and 32 deletions
--- a/ocaml-gsl.spec
+++ b/ocaml-gsl.spec
@ -1,12 +1,6 @@
-%if 0%{?fedora} >= 33
-%global blaslib flexiblas
-%else
-%global blaslib openblas
-%endif
-
 Name:           ocaml-gsl
 Version:        1.19.1
-Release:        34%{?dist}
+Release:        26%{?dist}.1
 Summary:        Interface to GSL (GNU scientific library) for OCaml
 License:        GPLv2

@ -29,7 +23,11 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  gsl-devel >= 1.9
 BuildRequires:  /usr/bin/awk
-BuildRequires:  %{blaslib}-devel
+%ifarch %{openblas_arches}
+BuildRequires:  openblas-devel
+%else
+BuildRequires:  atlas-devel
+%endif


 %description
@ -54,7 +52,11 @@ developing applications that use %{name}.


 %build
-export GSL_CBLAS_LIB="-l%{blaslib}"
+%ifarch %{openblas_arches}
+export GSL_CBLAS_LIB="-lopenblas"
+%else
+export GSL_CBLAS_LIB="-lgsl -L%{_libdir}/atlas -lsatlas"
+%endif
 make


@ -89,29 +91,8 @@ 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.
+* Thu Feb 27 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-26.1
+- OCaml 4.10.0 final (Fedora 32).

 * Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.19.1-26
 - OCaml 4.10.0 final.