[cduce] Rebuild for OCaml 3.12.

[Richard W.M. Jones]

commit c3949677d11b1c4c384e7cea29c0fe450c09623a
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Jan 21 15:35:25 2011 +0000

    Rebuild for OCaml 3.12.

 .gitignore                       |    2 +
 cduce-0.5.2.1-ocaml-3.11.0.patch |   85 --------------------------------------
 cduce.spec                       |   25 ++++++-----
 sources                          |    4 +-
 4 files changed, 18 insertions(+), 98 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d8fe866..b47faa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ ocamlduce-3.11.1.0.tar.gz
 ocaml-3.11.1.tar.bz2
 ocamlduce_3.11.2.0~rc1.orig.tar.gz
 ocaml-3.11.2+rc1.tar.bz2
+/ocaml-3.12.0.tar.bz2
+/ocamlduce_3.12.0.0.orig.tar.gz
diff --git a/cduce.spec b/cduce.spec
index 7330b78..25a28d7 100644
--- a/cduce.spec
+++ b/cduce.spec
@@ -1,19 +1,19 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %global debug_package %{nil}
 
-%global ocaml_major 3.11
-%global ocaml_minor 2
+%global ocaml_major 3.12
+%global ocaml_minor 0
 
-# Disabled temporarily for 3.11.2+rc1
+# Disabled temporarily for 3.11.2+rc1, 3.12.0
 %global with_ocamlduce 0
 
 %if %{with_ocamlduce}
-%global ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0+rc1
+%global ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0
 %endif
 
 Name:           cduce
 Version:        0.5.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Modern XML-oriented functional language
 
 Group:          Development/Libraries
@@ -23,10 +23,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    ppc64 s390 s390x sparc64
 
 Source0:        http://www.cduce.org/download/%{name}-%{version}.tar.gz
-Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}+rc1.tar.bz2
+Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
 %if %{with_ocamlduce}
 #Source2:        http://forge.ocamlcore.org/frs/download.php/225/ocamlduce-%{ocamlduce_version}.tar.gz
-Source2:        http://debian.glondu.net/debian/pool/ocaml3112rc1/1/ocamlduce_3.11.2.0~rc1.orig.tar.gz
+Source2:         http://debian.glondu.net/debian/ocaml-3.12.0/pool/ocamlduce/ocamlduce_3.12.0.0.orig.tar.gz
 %endif
 
 BuildRequires:  ocaml = %{ocaml_major}.%{ocaml_minor}
@@ -107,8 +107,8 @@ pushd ocamlduce-%{ocamlduce_version}
 make prepare \
   OCAML_VERSION=%{ocaml_major}.%{ocaml_minor} \
   OCAML_SOURCE=%{SOURCE1} \
-  OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}+rc1
-cd ocaml-%{ocaml_major}.%{ocaml_minor}+rc1
+  OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}
+cd ocaml-%{ocaml_major}.%{ocaml_minor}
   # Configure must match the one from base ocaml.spec
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
@@ -157,9 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %{_bindir}/cduce
 %{_bindir}/dtd2cduce
-%if %{with_ocamlduce}
 %{_bindir}/cduce_mktop
-%endif
 
 
 %files devel
@@ -179,6 +177,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 21 2010 Richard W.M. Jones <rjones at redhat.com> - 0.5.3-7
+- Recompile for OCaml 3.12.0.
+- Include ocamlduce from Stephane Glondu's version, but leave it
+  disabled since I still cannot get it to compile.
+
 * Thu Jan 14 2010 Richard W.M. Jones <rjones at redhat.com> - 0.5.3-6
 - Temporarily disable ocamlduce until we work out the build problem.
 - Recheck package with rpmlint.
diff --git a/sources b/sources
index f51f2cc..900b862 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 5506326db28419b3f578ff225417448f  cduce-0.5.3.tar.gz
-156792f0e7eb6733a44d94187eae00fd  ocamlduce_3.11.2.0~rc1.orig.tar.gz
-121dd62a03bbb1dfb3fb56e3a4bda874  ocaml-3.11.2+rc1.tar.bz2
+bd92c8970767f412bc1e9a6c625b5ccf  ocaml-3.12.0.tar.bz2
+c537a4aad027244a2941e514fae1878f  ocamlduce_3.12.0.0.orig.tar.gz