rpms/ocaml-findlib/devel findlib-camlp4-path.patch, NONE, 1.1 ocaml-findlib.spec, 1.2, 1.3

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml-findlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14620/devel

Modified Files:
	ocaml-findlib.spec 
Added Files:
	findlib-camlp4-path.patch 
Log Message:
* Thu Aug  2 2007 Richard W.M. Jones <rjones at redhat.com> - 1.1.2pl1-10
- BR added ocaml-ocamldoc so that ocamlfind ocamldoc works.
- Fix path of camlp4 parsers in Makefile.


findlib-camlp4-path.patch:

--- NEW FILE findlib-camlp4-path.patch ---
--- 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 --
 
 


Index: ocaml-findlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-findlib/devel/ocaml-findlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-findlib.spec	12 Jul 2007 17:43:21 -0000	1.2
+++ ocaml-findlib.spec	2 Aug 2007 12:32:55 -0000	1.3
@@ -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 @@
 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 @@
 
 %prep
 %setup -q -n findlib-%{version}
+%patch0 -p1
 
 
 %build
@@ -106,6 +110,10 @@
 
 
 %changelog
+* Thu Aug  2 2007 Richard W.M. Jones <rjones at redhat.com> - 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 <rjones at redhat.com> - 1.1.2pl1-9
 - Added ExcludeArch: ppc64