[cduce] New upstream version 0.5.5.

[Richard W.M. Jones]

commit fc05e44bcbfda3de9da1f94d8627f80fb8a98e35
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jul 3 15:53:53 2012 +0100

    New upstream version 0.5.5.
    
    - Remove OCaml sources; these are only needed for ocamlcduce which
      has been disabled.

 .gitignore |    1 +
 cduce.spec |   20 +++++++++++---------
 sources    |    4 +---
 3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cbcf400..25cd72f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ ocaml-3.11.2+rc1.tar.bz2
 /ocamlduce_3.12.0.0.orig.tar.gz
 /cduce-0.5.4.tar.gz
 /ocaml-3.12.1.tar.gz
+/cduce-0.5.5.tar.gz
diff --git a/cduce.spec b/cduce.spec
index 21472b7..629f839 100644
--- a/cduce.spec
+++ b/cduce.spec
@@ -1,10 +1,10 @@
 %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %global debug_package %{nil}
 
-%global ocaml_major 3.12
-%global ocaml_minor 1
+%global ocaml_major 4.00
+%global ocaml_minor 0
 
-# Disabled temporarily for 3.11.2+rc1, 3.12.0, 3.12.1
+# Disabled for 3.11.2+rc1, 3.12.0, 3.12.1, 4.00.0.
 %global with_ocamlduce 0
 
 %if %{with_ocamlduce}
@@ -12,8 +12,8 @@
 %endif
 
 Name:           cduce
-Version:        0.5.4
-Release:        5%{?dist}
+Version:        0.5.5
+Release:        1%{?dist}
 Summary:        Modern XML-oriented functional language
 
 Group:          Development/Libraries
@@ -23,8 +23,8 @@ 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}.tar.gz
 %if %{with_ocamlduce}
+Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.gz
 #Source2:        http://forge.ocamlcore.org/frs/download.php/225/ocamlduce-%{ocamlduce_version}.tar.gz
 Source2:         http://debian.glondu.net/debian/ocaml-3.12.0/pool/ocamlduce/ocamlduce_3.12.0.0.orig.tar.gz
 %endif
@@ -87,8 +87,6 @@ incorporates CDuce extensions for working with XML documents.
 %setup -q -n %{name}-%{version} -T -D -a 2
 %endif
 
-# Unpack the OCaml sources in the build directory.
-zcat %{SOURCE1} | tar xf -
 ./configure --prefix=%{_prefix} \
   --bindir=%{_bindir} \
   --mandir=%{_mandir} \
@@ -156,7 +154,6 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/ocaml/cduce/*.cmxa
 %endif
 %{_bindir}/cduce
-%{_bindir}/cduce_mktop
 
 
 %files devel
@@ -176,6 +173,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul  3 2012 Richard W.M. Jones <rjones at redhat.com> - 0.5.5-1
+- New upstream version 0.5.5.
+- Remove OCaml sources.  Required for cduce_mktop, but some upstream
+  work is needed to make this work with OCaml 4.00.0.
+
 * Mon Jun 11 2012 Richard W.M. Jones <rjones at redhat.com> - 0.5.4-5
 - Rebuild for OCaml 4.00.0.
 
diff --git a/sources b/sources
index 388faac..b6fc6b4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-a9a3b8e77f06a474b197d6f4bc263e96  cduce-0.5.4.tar.gz
-814a047085f0f901ab7d8e3a4b7a9e65  ocaml-3.12.1.tar.gz
-c537a4aad027244a2941e514fae1878f  ocamlduce_3.12.0.0.orig.tar.gz
+bf9726a9cbc6287c807a8b1113f1e71f  cduce-0.5.5.tar.gz