Author: rjones
Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21347
Modified Files:
.cvsignore cduce.spec sources
Log Message:
* Tue May 26 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.5.3-1
- New upstream release 0.5.3.
- Patch for compatibility with OCaml 3.11 now upstream.
- Rebuild for OCaml 3.11.1+rc0.
- Disable ocamlduce - waiting for upstream to release a compatible version.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 17 Jan 2009 14:26:40 -0000 1.6
+++ .cvsignore 26 May 2009 15:51:37 -0000 1.7
@@ -2,3 +2,5 @@ cduce-0.5.2.1.tar.gz
ocaml-3.10.2.tar.bz2
ocaml-3.11.0.tar.bz2
ocamlduce-3.11.0.0rc1.tar.gz
+ocaml-3.11.1+rc0.tar.gz
+cduce-0.5.3.tar.gz
Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- cduce.spec 16 Apr 2009 09:26:11 -0000 1.12
+++ cduce.spec 26 May 2009 15:51:38 -0000 1.13
@@ -2,13 +2,20 @@
%define debug_package %{nil}
%define ocaml_major 3.11
-%define ocaml_minor 0
+%define ocaml_minor 1
+# ocamlduce is disabled until upstream produce a version
+# which is compatible with OCaml 3.11.1.
+# http://forge.ocamlcore.org/frs/?group_id=75&release_id=69
+%define with_ocamlduce 0
+
+%if %{with_ocamlduce}
%define ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0rc1
+%endif
Name: cduce
-Version: 0.5.2.1
-Release: 14%{?dist}
+Version: 0.5.3
+Release: 1%{?dist}
Summary: Modern XML-oriented functional language
Group: Development/Libraries
@@ -18,10 +25,10 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
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.bz2
+Source1: http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}+rc0.tar.gz
+%if %{with_ocamlduce}
Source2: https://forge.ocamlcore.org/frs/download.php/107/ocamlduce-%{ocamlduce_version}.tar.gz
-
-Patch0: cduce-0.5.2.1-ocaml-3.11.0.patch
+%endif
BuildRequires: ocaml = %{ocaml_major}.%{ocaml_minor}
BuildRequires: ocaml-ocamldoc
@@ -64,6 +71,7 @@ The %{name}-devel package contains libra
developing applications that use %{name}.
+%if %{with_ocamlduce}
%package ocamlduce
Summary: Development files for %{name}
Group: Development/Libraries
@@ -73,21 +81,22 @@ Requires: %{name} = %{version}-%{r
%description ocamlduce
This package contains a modified version of the OCaml language which
incorporates CDuce extensions for working with XML documents.
+%endif
%prep
-%setup -q -n cduce-0.5.2
-%setup -q -n cduce-0.5.2 -T -D -a 2
-
-%patch0 -p1
+%setup -q -n %{name}-%{version}
+%if %{with_ocamlduce}
+%setup -q -n %{name}-%{version} -T -D -a 2
+%endif
# Unpack the OCaml sources in the build directory.
-bzcat %{SOURCE1} | tar xf -
+zcat %{SOURCE1} | tar xf -
./configure --prefix=%{_prefix} \
--bindir=%{_bindir} \
--mandir=%{_mandir} \
--docdir=%{_docdir} \
- --mliface=ocaml-%{ocaml_major}.%{ocaml_minor}
+ --mliface=ocaml-%{ocaml_major}.%{ocaml_minor}rc0
%build
@@ -95,13 +104,14 @@ make all doc
strip cduce dtd2cduce
chrpath --delete cduce
+%if %{with_ocamlduce}
# Building ocamlduce is a bit more involved ...
pushd ocamlduce-%{ocamlduce_version}
make prepare \
OCAML_VERSION=%{ocaml_major}.%{ocaml_minor} \
OCAML_SOURCE=%{SOURCE1} \
- OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}
-cd ocaml-%{ocaml_major}.%{ocaml_minor}
+ OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}rc0
+cd ocaml-%{ocaml_major}.%{ocaml_minor}rc0
# Configure must match the one from base ocaml.spec
CFLAGS="$RPM_OPT_FLAGS" ./configure \
-bindir %{_bindir} \
@@ -111,6 +121,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure \
-mandir %{_mandir}/man1
make -f Makefile.ocamlduce world world.opt
popd
+%endif
%install
@@ -123,6 +134,7 @@ make install \
MANDIR=$RPM_BUILD_ROOT%{_mandir} \
DOCDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
+%if %{with_ocamlduce}
# Install ocamlduce.
pushd ocamlduce-%{ocamlduce_version}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlduce
@@ -131,6 +143,7 @@ make -f Makefile.ocamlduce installbyte i
DUCE_LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlduce \
BINDIR=$RPM_BUILD_ROOT%{_bindir}
popd
+%endif
%clean
@@ -158,13 +171,21 @@ rm -rf $RPM_BUILD_ROOT
%{_docdir}/%{name}-devel-%{version}/
+%if %{with_ocamlduce}
%files ocamlduce
%defattr(-,root,root,-)
%{_bindir}/ocamlduce*
%{_libdir}/ocaml/ocamlduce/
+%endif
%changelog
+* Tue May 26 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.5.3-1
+- New upstream release 0.5.3.
+- Patch for compatibility with OCaml 3.11 now upstream.
+- Rebuild for OCaml 3.11.1+rc0.
+- Disable ocamlduce - waiting for upstream to release a compatible version.
+
* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@xxxxxxxxxxxxxxxxxxxxxxx>
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
(added sparc64 per request from the sparc maintainer)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 17 Jan 2009 14:26:40 -0000 1.6
+++ sources 26 May 2009 15:51:38 -0000 1.7
@@ -1,3 +1,3 @@
-d2d52bf536c1a8f4397b4c64794d9322 cduce-0.5.2.1.tar.gz
-6ed1c3ed660a15408362242fa8fa4668 ocaml-3.11.0.tar.bz2
0e36873aa7c3ae9684a49e3e831446ed ocamlduce-3.11.0.0rc1.tar.gz
+45f626b33bec543a40abbf6afa1a6d96 ocaml-3.11.1+rc0.tar.gz
+5506326db28419b3f578ff225417448f cduce-0.5.3.tar.gz
_______________________________________________
Fedora-ocaml-list mailing list
Fedora-ocaml-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-ocaml-list
