- Use ocamlc now that we have it.

- Rename package correctly.
- BuildRequires fixed for mock.

diff --git a/ocaml-findlib/mingw32-ocaml-findlib.spec b/ocaml-findlib/mingw32-ocaml-findlib.spec
index 55c9ef6..287ad10 100644 (file)
--- a/ocaml-findlib/mingw32-ocaml-findlib.spec
+++ b/ocaml-findlib/mingw32-ocaml-findlib.spec
@@ -16,9 +16,9 @@
 # OCAMLFIND_CONF=/etc/i686-pc-mingw32-ocamlfind.conf \
 #   ocamlfind cmd ...
 
-Name:           mingw32-findlib
+Name:           mingw32-ocaml-findlib
 Version:        1.2.2
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows Objective CAML package manager and build helper
 
 License:        BSD
@@ -35,10 +35,15 @@ BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  ocaml
-BuildRequires:  mingw32-ocaml
+BuildRequires:  ocaml-camlp4-devel
+BuildRequires:  ocaml-labltk-devel
+BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-8
 BuildRequires:  m4
 BuildRequires:  gawk
 
+# Early versions were accidentally misnamed.
+Obsoletes:      mingw32-findlib <= 1.2.2-5
+
 
 %description
 Objective CAML package manager and build helper.
@@ -128,5 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-6
+- Use ocamlc now that we have it.
+- Rename package correctly.
+
 * Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-3
 - Initial RPM release.

diff --git a/ocaml-findlib/ocamlfind.conf.in b/ocaml-findlib/ocamlfind.conf.in
index ff64e3f..d2a1b63 100644 (file)
--- a/ocaml-findlib/ocamlfind.conf.in
+++ b/ocaml-findlib/ocamlfind.conf.in
@@ -2,6 +2,6 @@ stdlib="@libdir@/@target@-ocaml"
 ldconf="@libdir@/@target@-ocaml/ld.conf"
 destdir="@libdir@/@target@-ocaml"
 path="@libdir@/@target@-ocaml"
-ocamlc="@target@-ocamlopt"
+ocamlc="@target@-ocamlc"
 ocamlopt="@target@-ocamlopt"
-ocamldep="@target@-ocamlopt"
+ocamldep="@target@-ocamldep"