[ocaml] - Make OCaml dependency generator self-contained so it doesn't need previous version of OCaml arou
Richard W.M. Jones
rjones at fedoraproject.org
Thu Jun 7 17:49:25 UTC 2012
commit dca4925f9e2d7f6d25c20fa307650b770c3a55dd
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Jun 7 18:29:32 2012 +0100
- Make OCaml dependency generator self-contained so it doesn't need
previous version of OCaml around.
ocaml.spec | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/ocaml.spec b/ocaml.spec
index f36bf6b..3088b96 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -1,6 +1,6 @@
Name: ocaml
Version: 4.00.0
-Release: 0.2.beta2%{?dist}
+Release: 0.3.beta2%{?dist}
Summary: OCaml compiler and programming environment
@@ -35,10 +35,6 @@ Patch0005: 0005-configure-Allow-user-defined-C-compiler-flags.patch
Patch0006: 0006-Link-dllthreads.so-with-lpthread-so-that-pthread_atf.patch
Patch0007: 0007-Add-support-for-ppc64.patch
-# Depend on previous version of OCaml so that ocamlobjinfo
-# can run.
-BuildRequires: ocaml
-
BuildRequires: ncurses-devel
BuildRequires: gdbm-devel
BuildRequires: tcl-devel
@@ -86,8 +82,8 @@ ExclusiveArch: alpha %{arm} ia64 %{ix86} x86_64 ppc ppc64 sparc sparcv9
%global natdynlink 0
%endif
-%global __ocaml_requires_opts -c -f %{buildroot}%{_bindir}/ocamlobjinfo
-%global __ocaml_provides_opts -f %{buildroot}%{_bindir}/ocamlobjinfo
+%global __ocaml_requires_opts -c -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo'
+%global __ocaml_provides_opts -f '%{buildroot}%{_bindir}/ocamlrun %{buildroot}%{_bindir}/ocamlobjinfo'
%description
@@ -527,7 +523,7 @@ fi
%changelog
-* Thu Jun 7 2012 Richard W.M. Jones <rjones at redhat.com> 4.00.0-0.2.beta2
+* Thu Jun 7 2012 Richard W.M. Jones <rjones at redhat.com> 4.00.0-0.3.beta2
- Upgrade to OCaml 4.00.0 beta 2.
- The language is now officially called OCaml (not Objective Caml, O'Caml etc)
- Rebase patches on top:
@@ -543,6 +539,8 @@ fi
- alpha, ia64 native backends have been removed upstream, so they are
no longer supported as native compiler targets.
- Remove defattr.
+- Make OCaml dependency generator self-contained so it doesn't need
+ previous version of OCaml around.
* Wed Jun 6 2012 Richard W.M. Jones <rjones at redhat.com> 3.12.1-12
- ppc64: Include fix for minor heap corruption because of unaligned
More information about the scm-commits
mailing list