Remove conditional BRs.

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

ocaml-base.spec

@@ -3,24 +3,20 @@
 # tests at all until we are able to add ppx_jane to Fedora, and even then we
 # will only be able to run the tests in non-bootstrap mode.
 
-%ifnarch %{ocaml_native_compiler}
-%global debug_package %{nil}
-%endif
-
 %global srcname base
 
 Name:           ocaml-%{srcname}
-Version:        0.13.1
-Release:        2%{?dist}.1
+Version:        0.14.0
+Release:        4%{?dist}
 Summary:        Jane Street standard library for OCaml
 
 License:        MIT
 URL:            https://github.com/janestreet/%{srcname}
 Source0:        %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
 
-BuildRequires:  ocaml >= 4.04.2
-BuildRequires:  ocaml-dune-devel >= 1.5.1
-BuildRequires:  ocaml-sexplib0-devel >= 0.13
+BuildRequires:  ocaml >= 4.07.0
+BuildRequires:  ocaml-dune-devel >= 2.0.0
+BuildRequires:  ocaml-sexplib0-devel >= 0.14
 
 %description
 Base is a standard library for OCaml.  It provides a standard set of
@@ -50,17 +46,17 @@ dune build %{?_smp_mflags}
 # TODO: Once odoc is available, BR it and run this to generate documentation:
 # dune build %{?_smp_mflags} @doc
 
-# Dune passes RPM_LD_FLAGS to ocamlmklib without -ldopt, resulting in "Unknown
-# option" warnings from ocamlmklib and a library that has not been linked with
-# the correct flags.  We can't add -ldopt ourselves, since that breaks
-# compilation of the cmxs files.  This seems to be a weakness of dune; linker
-# flags and libraries to be linked with have to be specified together, and
-# nothing takes care of separating them and adding ldopt as necessary.  We
+# Dune passes %%build_ldflags to ocamlmklib without -ldopt, resulting in
+# "Unknown option" warnings from ocamlmklib and a library that has not been
+# linked with the correct flags.  We can't add -ldopt ourselves, since that
+# breaks compilation of the cmxs files.  This seems to be a weakness of dune;
+# linker flags and libraries to be linked with have to be specified together,
+# and nothing takes care of separating them and adding ldopt as necessary.  We
 # relink manually to address the problem.
 pushd _build/default/src
-ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o base_stubs *.o
+ocamlmklib -g -ldopt "%build_ldflags" -o base_stubs *.o
 cd ../hash_types/src
-ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o base_internalhash_types_stubs *.o
+ocamlmklib -g -ldopt "%build_ldflags" -o base_internalhash_types_stubs *.o
 popd
 
 %install
@@ -75,7 +71,7 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
 %endif
 
 %files
-%doc CHANGES.md CONTRIBUTING.md README.org ROADMAP.md
+%doc CHANGES.md README.org ROADMAP.md
 %license LICENSE.md
 %dir %{_libdir}/ocaml/%{srcname}/
 %dir %{_libdir}/ocaml/%{srcname}/base_internalhash_types/
@@ -118,8 +114,29 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
 %{_libdir}/ocaml/%{srcname}/*/*.mli
 
 %changelog
-* Fri Feb 28 2020 Richard W.M. Jones <rjones@redhat.com> - 0.13.1-2.1
-- OCaml 4.10.0 final (Fedora 32).
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-4
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-3
+- OCaml 4.11.0 rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jun 17 2020 Jerry James <loganjerry@gmail.com> - 0.14.0-1
+- Version 0.14.0
+
+* Tue May 12 2020 Jerry James <loganjerry@gmail.com> - 0.13.2-1
+- Version 0.13.2
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 0.13.1-5
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.13.1-4
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 0.13.1-3
+- Update all OCaml dependencies for RPM 4.16.
 
 * Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 0.13.1-2
 - OCaml 4.10.0 final.

sources

@@ -1 +1 @@
-SHA512 (base-0.13.1.tar.gz) = 47a8e5c4159f0b2bc31e443749aeb1782a1a56c931b951e96cea764237ed6d450b991eeb2994cfb30f6e55fb571e2a20549a21a2b4e66a76ba745af286214c12
+SHA512 (base-0.14.0.tar.gz) = c713c9aaf369bc042afb1ead53dc5a34a6eb3c97abc7fef99868e3be8e976adc6297f34d13cfc314adf2182fc64b0cde9c9a05aeeb0f51380255aa1f8e0edf16