From aa15b569ca77029af810b7db55aa4cdea90a86fd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 4 Dec 2008 14:05:05 +0000 Subject: [PATCH] camlp4/META: camlp4.lib should depend on dynlink. --- ocaml-findlib-1.2.3-camlp4-META.patch | 11 +++++++++++ ocaml-findlib.spec | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ocaml-findlib-1.2.3-camlp4-META.patch diff --git a/ocaml-findlib-1.2.3-camlp4-META.patch b/ocaml-findlib-1.2.3-camlp4-META.patch new file mode 100644 index 0000000..2dafe14 --- /dev/null +++ b/ocaml-findlib-1.2.3-camlp4-META.patch @@ -0,0 +1,11 @@ +--- findlib-1.2.3.orig/site-lib-src/camlp4.310/META.in 2008-07-23 15:40:52.000000000 +0100 ++++ findlib-1.2.3/site-lib-src/camlp4.310/META.in 2008-12-04 13:57:07.000000000 +0000 +@@ -15,7 +15,7 @@ + `preprocessor = "'camlp4_cmd`"' + + `package "lib" (' +-` requires = "camlp4"' ++` requires = "camlp4,dynlink"' + ` version = "[distributed with Ocaml]"' + ` description = "Camlp4 library"' + ` archive(byte) = "camlp4lib.cma"' diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 3d88e8d..9a05c65 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -3,7 +3,7 @@ Name: ocaml-findlib Version: 1.2.3 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Objective CAML package manager and build helper Group: Development/Libraries @@ -12,6 +12,8 @@ URL: http://projects.camlcity.org/projects/findlib.html Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: ocaml-findlib-1.2.3-camlp4-META.patch + BuildRequires: ocaml >= 3.10.2 BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-labltk-devel @@ -40,6 +42,7 @@ developing applications that use %{name}. %prep %setup -q -n findlib-%{version} +%patch0 -p1 %build @@ -109,6 +112,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 4 2008 Richard W.M. Jones - 1.2.3-4 +- camlp4/META: camlp4.lib should depend on dynlink. + +* Wed Nov 26 2008 Richard W.M. Jones - 1.2.3-3 +- Rebuild for OCaml 3.11.0+rc1. + * Fri Nov 20 2008 Richard W.M. Jones - 1.2.3-2 - Force rebuild.