rpms/ocaml/devel ocaml-find-provides.sh, 1.1, 1.2 ocaml-find-requires.sh, 1.2, 1.3 ocaml.spec, 1.33, 1.34

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv801

Modified Files:
	ocaml-find-provides.sh ocaml-find-requires.sh ocaml.spec 
Log Message:
* Thu Sep  6 2007 Richard W.M. Jones <rjones at 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.



Index: ocaml-find-provides.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-provides.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ocaml-find-provides.sh	2 Jul 2007 15:13:39 -0000	1.1
+++ ocaml-find-provides.sh	6 Sep 2007 11:49:59 -0000	1.2
@@ -56,9 +56,9 @@
 # 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


Index: ocaml-find-requires.sh
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml-find-requires.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ocaml-find-requires.sh	3 Sep 2007 14:35:10 -0000	1.2
+++ ocaml-find-requires.sh	6 Sep 2007 11:49:59 -0000	1.3
@@ -58,7 +58,7 @@
 # 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 |


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ocaml.spec	3 Sep 2007 14:35:10 -0000	1.33
+++ ocaml.spec	6 Sep 2007 11:49:59 -0000	1.34
@@ -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:  libXt-devel
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
+BuildRequires:  chrpath
 Requires:       gcc
 Requires:       ncurses-devel
 Requires:       gdbm-devel
@@ -189,7 +190,7 @@
 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 @@
 
 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 @@
 
 
 %changelog
+* Thu Sep  6 2007 Richard W.M. Jones <rjones at 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 at 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