[apron] Adapt to mlgmpidl 1.2.

[Jerry James]

commit bc0b9bfedd2ee1ade7d013a0799d978654903af5
Author: Jerry James <loganjerry at gmail.com>
Date:   Thu May 10 10:01:00 2012 -0600

    Adapt to mlgmpidl 1.2.

 apron-mlgmpidl12.patch |   11 +++++++++++
 apron.spec             |    5 ++++-
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/apron-mlgmpidl12.patch b/apron-mlgmpidl12.patch
new file mode 100644
index 0000000..c2a69e0
--- /dev/null
+++ b/apron-mlgmpidl12.patch
@@ -0,0 +1,11 @@
+--- ./mlapronidl/scalar.ml.orig	2009-12-22 06:43:20.000000000 -0700
++++ ./mlapronidl/scalar.ml	2012-05-10 09:52:30.119999946 -0600
+@@ -89,7 +89,7 @@ match scalar with
+ | Mpfrf x ->
+ let y = Mpfr.init2 (Mpfr.get_prec x) in
+ ignore (Mpfr.neg y x Mpfr.Up);
+-Mpfrf(Mpfrf.mpfrf y)
++Mpfrf(Mpfrf._mpfrf y)
+ 	     | Float x -> Float(-. x)
+ let to_string scalar =
+ match scalar with
diff --git a/apron.spec b/apron.spec
index 4cedf77..c7436b1 100644
--- a/apron.spec
+++ b/apron.spec
@@ -19,6 +19,8 @@ Source0:        http://apron.cri.ensmp.fr/library/%{name}-%{version}.tgz
 # libap_pkgrid be weak references, since that library can be combined with
 # either of the 2 implementations.
 Patch0:         %{name}-weak.patch
+# Sent upstream 10 May 2012.  This patch adapts to mlgmpidl 1.2.
+Patch1:         %{name}-mlgmpidl12.patch
 
 BuildRequires:  mpfr-devel
 BuildRequires:  ppl-devel
@@ -76,13 +78,14 @@ Development files for the Ocaml interface to the APRON library.
 %prep
 %setup -q
 %patch0
+%patch1
 
 # Set the configuration values
 sed -e "s|^# HAS_CPP.*|HAS_CPP = 1|" \
     -e "s|^# HAS_PPL.*|HAS_PPL = 1|" \
     -e "s|^# HAS_LONG_DOUBLE.*|HAS_LONG_DOUBLE = 1|" \
     -e "s|^APRON_PREFIX =.*|APRON_PREFIX=%{_prefix}|" \
-    -e "s|^MLGMPIDL_PREFIX =.*|MLGMPIDL_PREFIX=%{_libdir}/ocaml/mlgmpidl|" \
+    -e "s|^MLGMPIDL_PREFIX =.*|MLGMPIDL_PREFIX=%{_libdir}/ocaml/gmp|" \
     -e "s|^PPL_PREFIX =.*|PPL_PREFIX=%{_prefix}|" \
     -e "s|^-fPIC -O3 -DNDEBUG|$RPM_OPT_FLAGS -fPIC -DNDEBUG -Wl,--as-needed|" \
     -e "s|^-fPIC -g -O0|$RPM_OPT_FLAGS -fPIC -O0 -Wl,--as-needed|" \