From 34cb4f24e6c3575cd52bf27d2c7d44c5e1c602eb Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 3 Sep 2007 14:35:10 +0000 Subject: [PATCH] - ocaml-runtime provides ocaml(runtime) = 3.10.0, and ocaml-find-requires.sh modified so that it adds this requires to other packages. Now can upgrade base ocaml packages without needing to rebuild everything else. --- ocaml-find-requires.sh | 9 ++++----- ocaml.spec | 10 +++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ocaml-find-requires.sh b/ocaml-find-requires.sh index c5c5946..98f8b9b 100755 --- a/ocaml-find-requires.sh +++ b/ocaml-find-requires.sh @@ -1,7 +1,7 @@ #!/bin/sh - # OCaml-specific "find-requires" for RPM. # By Richard W.M. Jones -# $Id: ocaml-find-requires.sh,v 1.7 2007/06/11 15:03:17 rjones Exp $ +# $Id: ocaml-find-requires.sh,v 1.1 2007/07/02 15:13:39 gemi Exp $ #set -x @@ -66,8 +66,7 @@ grep -Ev "$ignore_modules_re" | sort -u if [ -n "$emit_compiler_version" ]; then - # Every OCaml program depends on the precise version of the - # compiler which was used to compile it. - # rpm -q --qf '%{NAME} = %{VERSION}-%{RELEASE}\n' ocaml - echo "ocaml = `cat /usr/lib*/ocaml/fedora-ocaml-release`" + # Every OCaml program depends on the version of the + # runtime which was used to compile it. + echo "ocaml(runtime) = `cat /usr/lib*/ocaml/fedora-ocaml-release`" fi diff --git a/ocaml.spec b/ocaml.spec index 2f7a50e..6746b6f 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -1,6 +1,6 @@ Name: ocaml Version: 3.10.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Objective Caml compiler and programming environment @@ -38,6 +38,7 @@ BuildRequires: mesa-libGLU-devel Requires: gcc Requires: ncurses-devel Requires: gdbm-devel +Provides: ocaml(compiler) = %{version} ExcludeArch: ppc64 %description @@ -54,6 +55,7 @@ and a comprehensive library. Group: System Environment/Libraries Summary: Objective Caml runtime environment Requires: util-linux-ng +Provides: ocaml(runtime) = %{version} %description runtime Objective Caml is a high-level, strongly-typed, functional and @@ -421,6 +423,12 @@ fi %changelog +* Mon Sep 3 2007 Richard W.M. Jones - 3.10.0-6 +- ocaml-runtime provides ocaml(runtime) = 3.10.0, and + ocaml-find-requires.sh modified so that it adds this requires + to other packages. Now can upgrade base ocaml packages without + needing to rebuild everything else. + * Mon Sep 3 2007 Richard W.M. Jones - 3.10.0-5 - Don't include the release number in fedora-ocaml-release file, so that packages built against this won't depend on the Fedora release.