- BR added ocaml-ocamldoc so that ocamlfind ocamldoc works.
- Fix path of camlp4 parsers in Makefile.
This commit is contained in:
parent
fabcb9e0da
commit
88e6bb7901
11
findlib-camlp4-path.patch
Normal file
11
findlib-camlp4-path.patch
Normal file
@ -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 --
|
||||||
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: ocaml-findlib
|
Name: ocaml-findlib
|
||||||
Version: 1.1.2pl1
|
Version: 1.1.2pl1
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
Summary: Objective CAML package manager and build helper
|
Summary: Objective CAML package manager and build helper
|
||||||
|
|
||||||
Group: Development/Libraries
|
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)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
ExcludeArch: ppc64
|
ExcludeArch: ppc64
|
||||||
|
|
||||||
|
Patch0: findlib-camlp4-path.patch
|
||||||
|
|
||||||
BuildRequires: ocaml >= 3.10.0
|
BuildRequires: ocaml >= 3.10.0
|
||||||
BuildRequires: ocaml-camlp4-devel
|
BuildRequires: ocaml-camlp4-devel
|
||||||
BuildRequires: ocaml-labltk-devel
|
BuildRequires: ocaml-labltk-devel
|
||||||
|
BuildRequires: ocaml-ocamldoc
|
||||||
BuildRequires: m4, ncurses-devel
|
BuildRequires: m4, ncurses-devel
|
||||||
|
|
||||||
%define _use_internal_dependency_generator 0
|
%define _use_internal_dependency_generator 0
|
||||||
@ -40,6 +43,7 @@ developing applications that use %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n findlib-%{version}
|
%setup -q -n findlib-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -106,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 2 2007 Richard W.M. Jones <rjones@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@redhat.com> - 1.1.2pl1-9
|
* Thu Jul 12 2007 Richard W.M. Jones <rjones@redhat.com> - 1.1.2pl1-9
|
||||||
- Added ExcludeArch: ppc64
|
- Added ExcludeArch: ppc64
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user