X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml-calendar%2Fmingw32-ocaml-calendar.spec;h=43b40c3ba48c254c4ded595e83b72d73a7edfde9;hb=5a4e88c28b4724b9afad68a96c47206424b53a86;hp=8ef839a86bc32861c7212b552df99eb7324d0adf;hpb=08ad93f44c0e89aa241804a7cdeabe2df5689c2c;p=fedora-mingw.git

diff --git a/ocaml-calendar/mingw32-ocaml-calendar.spec b/ocaml-calendar/mingw32-ocaml-calendar.spec
index 8ef839a..43b40c3 100644
--- a/ocaml-calendar/mingw32-ocaml-calendar.spec
+++ b/ocaml-calendar/mingw32-ocaml-calendar.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-ocaml-calendar
 Version:        2.0.4
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows OCaml library for managing dates and times
 
 License:        LGPLv2+
@@ -21,7 +21,7 @@ BuildArch:      noarch
 BuildRequires:  mingw32-filesystem >= 35
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-ocaml >= 3.11.0+beta1-9
+BuildRequires:  mingw32-ocaml >= 3.11.0-0.15.beta1
 BuildRequires:  mingw32-ocaml-findlib >= 1.2.2-7
 
 
@@ -39,7 +39,9 @@ export OCAMLFIND_CONF=/etc/i686-pc-mingw32-ocamlfind.conf
 %{_mingw32_configure} \
   --libdir=%{_libdir} \
   OCAMLC=i686-pc-mingw32-ocamlc \
+  OCAMLCDOTOPT=i686-pc-mingw32-ocamlc \
   OCAMLOPT=i686-pc-mingw32-ocamlopt \
+  OCAMLOPTDOTOPT=i686-pc-mingw32-ocamlopt \
   OCAMLDEP=i686-pc-mingw32-ocamldep
 make
 
@@ -65,6 +67,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 23 2008 Richard W.M. Jones <rjones@redhat.com> - 2.0.4-4
+- Rebuild with newly named mingw32-ocaml cross-compiler.
+
+* Thu Nov 20 2008 Richard W.M. Jones <rjones@redhat.com> - 2.0.4-3
+- Override ocamlc.opt, ocamlopt.opt in case a compatible native
+  compiler is also installed.
+
 * Sun Nov 16 2008 Richard W.M. Jones <rjones@redhat.com> - 2.0.4-2
 - Force rebuild with latest OCaml compiler.