rpms/cduce/devel .cvsignore, 1.7, 1.8 cduce.spec, 1.14, 1.15 sources, 1.7, 1.8

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7155

Modified Files:
	.cvsignore cduce.spec sources 
Log Message:
* Wed Sep 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.3-3
- Rebuild for OCaml 3.11.1.
- Reenable ocamlduce 3.11.1.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	26 May 2009 15:51:37 -0000	1.7
+++ .cvsignore	30 Sep 2009 12:23:14 -0000	1.8
@@ -4,3 +4,5 @@ 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
+ocamlduce-3.11.1.0.tar.gz
+ocaml-3.11.1.tar.bz2


Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- cduce.spec	24 Jul 2009 18:46:06 -0000	1.14
+++ cduce.spec	30 Sep 2009 12:23:14 -0000	1.15
@@ -4,18 +4,15 @@
 %define ocaml_major 3.11
 %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
+%define with_ocamlduce 1
 
 %if %{with_ocamlduce}
-%define ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0rc1
+%define ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0
 %endif
 
 Name:           cduce
 Version:        0.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Modern XML-oriented functional language
 
 Group:          Development/Libraries
@@ -25,9 +22,9 @@ 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}+rc0.tar.gz
+Source1:        http://caml.inria.fr/distrib/ocaml-%{ocaml_major}/ocaml-%{ocaml_major}.%{ocaml_minor}.tar.bz2
 %if %{with_ocamlduce}
-Source2:        https://forge.ocamlcore.org/frs/download.php/107/ocamlduce-%{ocamlduce_version}.tar.gz
+Source2:        http://forge.ocamlcore.org/frs/download.php/225/ocamlduce-%{ocamlduce_version}.tar.gz
 %endif
 
 BuildRequires:  ocaml = %{ocaml_major}.%{ocaml_minor}
@@ -91,12 +88,12 @@ incorporates CDuce extensions for workin
 %endif
 
 # Unpack the OCaml sources in the build directory.
-zcat %{SOURCE1} | tar xf -
+bzcat %{SOURCE1} | tar xf -
 ./configure --prefix=%{_prefix} \
   --bindir=%{_bindir} \
   --mandir=%{_mandir} \
   --docdir=%{_docdir} \
-  --mliface=ocaml-%{ocaml_major}.%{ocaml_minor}rc0
+  --mliface=ocaml-%{ocaml_major}.%{ocaml_minor}
 
 
 %build
@@ -110,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}rc0
-cd ocaml-%{ocaml_major}.%{ocaml_minor}rc0
+  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} \
@@ -180,6 +177,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 30 2009 Richard W.M. Jones <rjones at redhat.com> - 0.5.3-3
+- Rebuild for OCaml 3.11.1.
+- Reenable ocamlduce 3.11.1.0.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	26 May 2009 15:51:38 -0000	1.7
+++ sources	30 Sep 2009 12:23:14 -0000	1.8
@@ -1,3 +1,3 @@
-0e36873aa7c3ae9684a49e3e831446ed  ocamlduce-3.11.0.0rc1.tar.gz
-45f626b33bec543a40abbf6afa1a6d96  ocaml-3.11.1+rc0.tar.gz
 5506326db28419b3f578ff225417448f  cduce-0.5.3.tar.gz
+5ef11249b590ab038c45583369936baa  ocamlduce-3.11.1.0.tar.gz
+fe011781f37f6b41fe08e0706969a89e  ocaml-3.11.1.tar.bz2