X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml%2Fmingw32-ocaml.spec;h=6d1f29b7f5eccd8e8128192dda740a7a582946b3;hb=430eaabf1d0eacbbb3f3d0bc9f3f2243b0661fb0;hp=ed6937088fc5ddb53852add6ba638b0fdbb0cb2b;hpb=3c7db4c39f1bad202e7a36a2a31c56d9e1d631a9;p=fedora-mingw.git

diff --git a/ocaml/mingw32-ocaml.spec b/ocaml/mingw32-ocaml.spec
index ed69370..6d1f29b 100644
--- a/ocaml/mingw32-ocaml.spec
+++ b/ocaml/mingw32-ocaml.spec
@@ -1,5 +1,7 @@
-%define __strip %{_mingw32_strip}
-%define __objdump %{_mingw32_objdump}
+#%define __strip %{_mingw32_strip}
+#%define __objdump %{_mingw32_objdump}
+%define __strip :
+%define __objdump :
 %define _use_internal_dependency_generator 0
 %define __find_requires %{_mingw32_findrequires}
 %define __find_provides %{_mingw32_findprovides}
@@ -10,7 +12,7 @@
 
 Name:           mingw32-ocaml
 Version:        3.11.0+beta1
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Objective Caml MinGW cross-compiler and programming environment
 
 License:        QPL and (LGPLv2+ with exceptions)
@@ -54,6 +56,10 @@ Requires:       mingw32-gcc
 Requires:       mingw32-binutils
 Requires:       mingw32-flexdll
 
+# i686-pc-mingw32-ocamlmklib tries to run ocamlopt which is probably a
+# bug, but requires this (XXX).
+Requires:       ocaml
+
 
 %description
 Objective Caml is a high-level, strongly-typed, functional and
@@ -163,13 +169,15 @@ done
 make %{makevars} -C tools install
 make %{makevars} installopt
 
+install -m 0755 ocamlc $RPM_BUILD_ROOT%{_bindir}
+
 cp config/Makefile \
    $RPM_BUILD_ROOT%{_libdir}/%{_mingw32_target}-ocaml/Makefile.config
 
 # For bytecode binaries, change the bang-path to point to the locally
 # installed ocamlrun.
 pushd $RPM_BUILD_ROOT%{_bindir}
-for f in ocamlcp ocamldep ocamlmklib ocamlopt ocamlprof; do
+for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlopt ocamlprof; do
   mv $f $f.old
   echo '#!%{_bindir}/%{_mingw32_target}-ocamlrun' > $f
   tail -n +2 $f.old >> $f
@@ -180,7 +188,7 @@ popd
 
 # Rename all the binaries to target-binary.
 pushd $RPM_BUILD_ROOT%{_bindir}
-for f in ocamlcp ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof ocamlrun; do
+for f in ocamlc ocamlcp ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof ocamlrun; do
   mv $f %{_mingw32_target}-$f
 done
 popd
@@ -192,6 +200,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%{_bindir}/%{_mingw32_target}-ocamlc
 %{_bindir}/%{_mingw32_target}-ocamlcp
 %{_bindir}/%{_mingw32_target}-ocamldep
 %{_bindir}/%{_mingw32_target}-ocamlmklib
@@ -203,6 +212,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-8
+- Install ocamlc.
+
+* Sat Nov 15 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-7
+- Further requirements.
+
 * Sat Nov 15 2008 Richard W.M. Jones <rjones@redhat.com> - 3.11.0+beta1-6
 - Install tools, particularly ocamlmklib.