[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ocaml/devel ocaml-find-requires.sh, 1.4, 1.5 ocaml.spec, 1.58, 1.59



Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2155

Modified Files:
	ocaml-find-requires.sh ocaml.spec 
Log Message:
- ocaml-find-requires.sh: Calculate runtime version using ocamlrun
  -version instead of fedora-ocaml-release file.



Index: ocaml-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-requires.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- ocaml-find-requires.sh	20 Nov 2008 15:30:55 -0000	1.4
+++ ocaml-find-requires.sh	4 Oct 2009 22:34:51 -0000	1.5
@@ -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


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- ocaml.spec	30 Sep 2009 12:25:22 -0000	1.58
+++ ocaml.spec	4 Oct 2009 22:34:51 -0000	1.59
@@ -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).


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]