diff --git a/findlib-camlp4-path.patch b/findlib-camlp4-path.patch new file mode 100644 index 0000000..769f5b0 --- /dev/null +++ b/findlib-camlp4-path.patch @@ -0,0 +1,11 @@ +--- findlib-1.1.2pl1/src/findlib/Makefile.orig 2007-08-02 13:25:46.000000000 +0100 ++++ findlib-1.1.2pl1/src/findlib/Makefile 2007-08-02 13:25:25.000000000 +0100 +@@ -15,7 +15,7 @@ + OCAMLOPT = ocamlopt + OCAMLDEP = ocamldep + OCAMLLEX = ocamllex +-CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_o.cmo -- ++CAMLP4O = camlp4 -I `ocamlc -where`/camlp4/Camlp4Parsers/ pa_o.cmo pa_op.cmo pr_o.cmo -- + #CAMLP4O = camlp4 pa_o.cmo pa_op.cmo pr_dump.cmo -- + + diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 578ab39..6ea8bc2 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -3,7 +3,7 @@ Name: ocaml-findlib Version: 1.1.2pl1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Objective CAML package manager and build helper Group: Development/Libraries @@ -13,9 +13,12 @@ Source0: http://www.ocaml-programming.de/packages/findlib-1.1.2pl1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: ppc64 +Patch0: findlib-camlp4-path.patch + BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-labltk-devel +BuildRequires: ocaml-ocamldoc BuildRequires: m4, ncurses-devel %define _use_internal_dependency_generator 0 @@ -40,6 +43,7 @@ developing applications that use %{name}. %prep %setup -q -n findlib-%{version} +%patch0 -p1 %build @@ -106,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 2 2007 Richard W.M. Jones - 1.1.2pl1-10 +- BR added ocaml-ocamldoc so that ocamlfind ocamldoc works. +- Fix path of camlp4 parsers in Makefile. + * Thu Jul 12 2007 Richard W.M. Jones - 1.1.2pl1-9 - Added ExcludeArch: ppc64