Author: rjones
Update of /cvs/pkgs/rpms/ocaml-camlimages/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1474
Modified Files:
ocaml-camlimages.spec
Removed Files:
camlimages-3.0.2-add-image_intf.patch
Log Message:
Unclear still why this is failing to build .. try building image_intf.cmi explicitly.
Index: ocaml-camlimages.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-camlimages/devel/ocaml-camlimages.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- ocaml-camlimages.spec 16 Feb 2010 15:54:13 -0000 1.27
+++ ocaml-camlimages.spec 16 Feb 2010 16:08:13 -0000 1.28
@@ -4,7 +4,7 @@
Name: ocaml-camlimages
Version: 3.0.2
-Release: 4%{?dist}
+Release: 6%{?dist}
Summary: OCaml image processing library
Group: Development/Libraries
@@ -30,10 +30,6 @@ Patch2: camlimages-oversized-tif
# macros.
Patch3: camlimages-3.0.2-ocaml-autoconf.patch
-# image_intf.mli is not declared anywhere in the Makefile.
-# NOT upstream.
-Patch4: camlimages-3.0.2-add-image_intf.patch
-
BuildRequires: ocaml >= 3.10.1
BuildRequires: ocaml-lablgtk-devel
BuildRequires: ocaml-x11
@@ -81,7 +77,6 @@ Includes documentation provided by ocaml
%patch0 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
aclocal -I .
automake
autoconf
@@ -90,6 +85,14 @@ mv examples/liv/display.ml examples/liv/
%build
%configure
+
+# Hack: unclear why this is necessary, but the file image_intf
+# is not mentioned in the Makefile.
+make ||:
+pushd src
+ocamlc -I +lablgtk2 -c image_intf.mli
+popd
+
make
@@ -128,7 +131,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Wed Jan 12 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 3.0.2-4
+* Wed Jan 12 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 3.0.2-6
- Fix FTBFS RHBZ#564798.
* Wed Jan 12 2010 Richard W.M. Jones <rjones@xxxxxxxxxx> - 3.0.2-2
--- camlimages-3.0.2-add-image_intf.patch DELETED ---
_______________________________________________
ocaml-devel mailing list
ocaml-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel
