[ocaml] Make the compiler depend on ocaml-runtime explicitly.
Richard W.M. Jones
rjones at fedoraproject.org
Sat Jul 19 12:45:46 UTC 2014
commit 7439bfe61f1926258406701078edc4376c6f15e8
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sat Jul 19 13:40:48 2014 +0100
Make the compiler depend on ocaml-runtime explicitly.
ocaml.spec | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ocaml.spec b/ocaml.spec
index 52eb0fc..2c40220 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -20,7 +20,7 @@
Name: ocaml
Version: 4.02.0
-Release: 0.6.git%{shortcommit}%{?dist}
+Release: 0.7.git%{shortcommit}%{?dist}
Summary: OCaml compiler and programming environment
@@ -87,6 +87,11 @@ BuildRequires: git
Requires: gcc
Requires: rpm-build >= 4.8.0
+# Because we pass -c flag to ocaml-find-requires (to avoid circular
+# dependencies) we also have to explicitly depend on the right version
+# of ocaml-runtime.
+Requires: ocaml-runtime = %{version}-%{release}
+
# Bundles an MD5 implementation in byterun/md5.{c,h}
Provides: bundled(md5-plumb)
@@ -415,11 +420,12 @@ fi
%changelog
-* Sat Jul 19 2014 Richard W.M. Jones <rjones at redhat.com> - 4.02.0-0.6
+* Sat Jul 19 2014 Richard W.M. Jones <rjones at redhat.com> - 4.02.0-0.7
- Rebase on top of 4.02.0 beta commit c4f3a6c7.
- Remove the patch to disable CSE, since that problem is fixed upstream.
- Remove the patch fixing caml_callback2 on aarch64 since that patch is
now upstream.
+- Make the compiler depend on ocaml-runtime explicitly.
* Tue Jul 15 2014 Richard W.M. Jones <rjones at redhat.com> - 4.02.0-0.5
- Disable CSE optimization which is broken on armv7hl and aarch64.
More information about the scm-commits
mailing list