* Thu Nov 8 2007 Richard W.M. Jones <rjones@redhat.com> - 1.1.2pl1-16

- Removed paths patch, not necessary with camlp4 3.09.
This commit is contained in:
Richard W.M. Jones 2007-11-08 12:03:22 +00:00
parent a435795c8f
commit 0f3f882f83
2 changed files with 4 additions and 15 deletions

View File

@ -1,11 +0,0 @@
--- 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 --

View File

@ -3,7 +3,7 @@
Name: ocaml-findlib
Version: 1.1.2pl1
Release: 15%{?dist}
Release: 16%{?dist}
Summary: Objective CAML package manager and build helper
Group: Development/Libraries
@ -13,8 +13,6 @@ 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.09.3
BuildRequires: camlp4
BuildRequires: labltk
@ -39,7 +37,6 @@ developing applications that use %{name}.
%prep
%setup -q -n findlib-%{version}
%patch0 -p1
%build
@ -106,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Nov 8 2007 Richard W.M. Jones <rjones@redhat.com> - 1.1.2pl1-16
- Removed paths patch, not necessary with camlp4 3.09.
* Thu Nov 8 2007 Richard W.M. Jones <rjones@redhat.com> - 1.1.2pl1-15
- Rebuild for EPEL.