From 25069bf74ee743c9a9ebeda75d9256f23f033d72 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Thu, 6 Sep 2007 11:49:59 +0000
Subject: [PATCH] - Run chrpath to delete rpaths used on some of the stublibs.
 - Ignore Parsetree module in dependency calculation. - Fixed
 ocaml-find-{requires,provides}.sh regexp calculation so it doesn't    
 over-match module names.

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

diff --git a/ocaml-find-provides.sh b/ocaml-find-provides.sh
index 539699d..57cbb6e 100755
--- a/ocaml-find-provides.sh
+++ b/ocaml-find-provides.sh
@@ -1,7 +1,7 @@
 #!/bin/sh -
 # OCaml-specific "find-provides" for RPM.
 # By Richard W.M. Jones <rjones@redhat.com>
-# $Id: ocaml-find-provides.sh,v 1.7 2007/06/11 15:03:17 rjones Exp $
+# $Id: ocaml-find-provides.sh,v 1.1 2007/07/02 15:13:39 gemi Exp $
 
 #set -x
 
@@ -56,9 +56,9 @@ ignore_modules_re=`echo $ignore_modules | sed 's/ /|/g'`
 # Get a list of the modules these file(s) provide.
 $OCAMLOBJINFO $files |
 grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' |
-grep -E "$modules_re" |
+grep -E '[0-9a-f]{32}[[:space:]]+'"($modules_re)\$" |
 while read md5sum module; do
     echo "ocaml($module) = $md5sum"
 done |
 grep -Ev "$ignore_modules_re" |
-sort -u
\ No newline at end of file
+sort -u
diff --git a/ocaml-find-requires.sh b/ocaml-find-requires.sh
index 98f8b9b..567c49d 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.1 2007/07/02 15:13:39 gemi Exp $
+# $Id: ocaml-find-requires.sh,v 1.2 2007/09/03 14:35:10 rjones Exp $
 
 #set -x
 
@@ -58,7 +58,7 @@ ignore_modules_re=`echo $ignore_modules | sed 's/ /|/g'`
 # Get a list of the modules these file(s) depend on.
 $OCAMLOBJINFO $files |
 grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' |
-grep -Ev "$modules_re" |
+grep -Ev '[0-9a-f]{32}[[:space:]]+'"($modules_re)\$" |
 while read md5sum module; do
     echo "ocaml($module) = $md5sum"
 done |
diff --git a/ocaml.spec b/ocaml.spec
index 6746b6f..530a376 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.10.0
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -35,6 +35,7 @@ BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
+BuildRequires:  chrpath
 Requires:       gcc
 Requires:       ncurses-devel
 Requires:       gdbm-devel
@@ -189,7 +190,7 @@ man pages and info files.
 cp %{SOURCE2} refman.pdf
 
 %define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -c -f %{buildroot}%{_bindir}/ocamlobjinfo
+%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -i Parsetree -c -f %{buildroot}%{_bindir}/ocamlobjinfo
 %define __find_provides %{SOURCE5} -f %{buildroot}%{_bindir}/ocamlobjinfo
 
 %build
@@ -238,6 +239,9 @@ cp %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm/
 
 echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
 
+# Remove rpaths from stublibs .so files.
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -423,6 +427,12 @@ fi
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones@redhat.com> - 3.10.0-7
+- Run chrpath to delete rpaths used on some of the stublibs.
+- Ignore Parsetree module in dependency calculation.
+- Fixed ocaml-find-{requires,provides}.sh regexp calculation so it doesn't
+  over-match module names.
+
 * Mon Sep  3 2007 Richard W.M. Jones <rjones@redhat.com> - 3.10.0-6
 - ocaml-runtime provides ocaml(runtime) = 3.10.0, and
   ocaml-find-requires.sh modified so that it adds this requires