Author: rjones
Update of /cvs/pkgs/rpms/cduce/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31989
Modified Files:
.cvsignore cduce.spec sources
Log Message:
* Thu Jan 14 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.5.3-6
- Temporarily disable ocamlduce until we work out the build problem.
- Recheck package with rpmlint.
* Tue Jan 5 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.5.3-5
- ocamlduce: Upstream fix for OCaml 3.11.2+rc1.
- Use upstream RPM 4.8 OCaml dependency generator.
- Replace %%define with %%global.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore 30 Sep 2009 12:23:14 -0000 1.8
+++ .cvsignore 14 Jan 2010 19:04:31 -0000 1.9
@@ -6,3 +6,5 @@ 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
+ocamlduce_3.11.2.0~rc1.orig.tar.gz
+ocaml-3.11.2+rc1.tar.bz2
Index: cduce.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/cduce.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- cduce.spec 30 Dec 2009 13:47:20 -0000 1.16
+++ cduce.spec 14 Jan 2010 19:04:31 -0000 1.17
@@ -1,18 +1,19 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
-%define ocaml_major 3.11
-%define ocaml_minor 1
+%global ocaml_major 3.11
+%global ocaml_minor 2
-%define with_ocamlduce 1
+# Disabled temporarily for 3.11.2+rc1
+%global with_ocamlduce 0
%if %{with_ocamlduce}
-%define ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0
+%global ocamlduce_version %{ocaml_major}.%{ocaml_minor}.0+rc1
%endif
Name: cduce
Version: 0.5.3
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: Modern XML-oriented functional language
Group: Development/Libraries
@@ -22,9 +23,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}+rc1.tar.bz2
%if %{with_ocamlduce}
-Source2: http://forge.ocamlcore.org/frs/download.php/225/ocamlduce-%{ocamlduce_version}.tar.gz
+#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
%endif
BuildRequires: ocaml = %{ocaml_major}.%{ocaml_minor}
@@ -42,9 +44,7 @@ BuildRequires: bzip2
BuildRequires: chrpath
BuildRequires: rpm >= 4.4.2.3-2
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%global __ocaml_requires_opts -i Asttypes -i Outcometree -i Parsetree
%description
@@ -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}
-cd ocaml-%{ocaml_major}.%{ocaml_minor}
+ OCAML_SRCDIR=ocaml-%{ocaml_major}.%{ocaml_minor}+rc1
+cd ocaml-%{ocaml_major}.%{ocaml_minor}+rc1
# Configure must match the one from base ocaml.spec
CFLAGS="$RPM_OPT_FLAGS" ./configure \
-bindir %{_bindir} \
@@ -157,7 +157,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%{_bindir}/cduce
%{_bindir}/dtd2cduce
+%if %{with_ocamlduce}
%{_bindir}/cduce_mktop
+%endif
%files devel
@@ -177,6 +179,15 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jan 14 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.5.3-6
+- Temporarily disable ocamlduce until we work out the build problem.
+- Recheck package with rpmlint.
+
+* Tue Jan 5 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.5.3-5
+- ocamlduce: Upstream fix for OCaml 3.11.2+rc1.
+- Use upstream RPM 4.8 OCaml dependency generator.
+- Replace %%define with %%global.
+
* Wed Dec 30 2009 Richard W.M. Jones <rjones@xxxxxxxxxx> - 0.5.3-4
- Rebuild for OCaml 3.11.2.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cduce/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 30 Sep 2009 12:23:14 -0000 1.8
+++ sources 14 Jan 2010 19:04:31 -0000 1.9
@@ -1,3 +1,3 @@
5506326db28419b3f578ff225417448f cduce-0.5.3.tar.gz
-5ef11249b590ab038c45583369936baa ocamlduce-3.11.1.0.tar.gz
-fe011781f37f6b41fe08e0706969a89e ocaml-3.11.1.tar.bz2
+156792f0e7eb6733a44d94187eae00fd ocamlduce_3.11.2.0~rc1.orig.tar.gz
+121dd62a03bbb1dfb3fb56e3a4bda874 ocaml-3.11.2+rc1.tar.bz2
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
