From 7f67559c7f7e12967af27e901f4e95f21596aef8 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Sun, 4 Oct 2009 22:34:51 +0000
Subject: [PATCH] - ocaml-find-requires.sh: Calculate runtime version using
 ocamlrun -version instead of fedora-ocaml-release file.

---
 ocaml-find-requires.sh | 4 ++--
 ocaml.spec             | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ocaml-find-requires.sh b/ocaml-find-requires.sh
index aff0f5f..ef2c93d 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 <rjones@redhat.com>
-# $Id: ocaml-find-requires.sh,v 1.3 2007/09/06 11:49:59 rjones Exp $
+# $Id: ocaml-find-requires.sh,v 1.4 2008/11/20 15:30:55 rjones Exp $
 
 #set -x
 
@@ -69,5 +69,5 @@ sort -u
 if [ -n "$emit_compiler_version" ]; then
     # 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`"
+    echo "ocaml(runtime) = `ocamlrun -version | awk '{print $NF}' | sed 's/\+.*//'`"
 fi
diff --git a/ocaml.spec b/ocaml.spec
index aebdec8..70a7c50 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -2,7 +2,7 @@
 
 Name:           ocaml
 Version:        3.11.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Objective Caml compiler and programming environment
 
@@ -433,6 +433,10 @@ fi
 
 
 %changelog
+* Sun Oct  4 2009 Richard W.M. Jones <rjones@redhat.com> - 3.11.1-2
+- ocaml-find-requires.sh: Calculate runtime version using ocamlrun
+  -version instead of fedora-ocaml-release file.
+
 * Wed Sep 30 2009 Richard W.M. Jones <rjones@redhat.com> - 3.11.1-1
 - OCaml 3.11.1 (this is virtually the same as the release candidate
   that we were using for Fedora 12).