X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml-findlib%2Fmingw32-ocaml-findlib.spec;h=d30184a9ae16aa16fc8add8f734f3ac730706be8;hb=60a6a789a1e4dbac5373bc44a9aa005b618e3716;hp=55c9ef6fd2044210f10e8805078ee338d6125e32;hpb=7d1516cd3616f013653da2e98abc9bbed0b544f2;p=fedora-mingw.git

diff --git a/ocaml-findlib/mingw32-ocaml-findlib.spec b/ocaml-findlib/mingw32-ocaml-findlib.spec
index 55c9ef6..d30184a 100644
--- 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:        7%{?dist}
 Summary:        MinGW Windows Objective CAML package manager and build helper
 
 License:        BSD
@@ -35,10 +35,18 @@ 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
 
+# Installing this should pull in ocamlfind (native binary).
+Requires:       ocaml-findlib
+
+# Early versions were accidentally misnamed.
+Obsoletes:      mingw32-findlib <= 1.2.2-5
+
 
 %description
 Objective CAML package manager and build helper.
@@ -128,5 +136,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-7
+- Use ocamlc now that we have it.
+- Rename package correctly.
+- Pull in ocamlfind binary.
+
 * Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.2-3
 - Initial RPM release.