rpms/ocaml-ocamlnet/devel ocaml-ocamlnet.spec,1.6,1.7

[Richard W.M. Jones]

Author: rjones

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

Modified Files:
	ocaml-ocamlnet.spec 
Log Message:
* Tue Sep  2 2008 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-7
- Prevent RPM & prelink from stripping bytecode.



Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ocaml-ocamlnet.spec	23 Apr 2008 16:16:57 -0000	1.6
+++ ocaml-ocamlnet.spec	2 Sep 2008 09:01:38 -0000	1.7
@@ -1,9 +1,12 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
+# Prevent RPM from stripping the binaries.
+%define __strip /bin/true
+
 Name:           ocaml-ocamlnet
 Version:        2.2.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
@@ -154,8 +157,12 @@
 
 # Strip libraries.
 strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
-# NB. Do NOT strip the binaries.
+
+# NB. Do NOT strip the binaries and prevent prelink from stripping them too.
 # (https://bugzilla.redhat.com/show_bug.cgi?id=435559)
+mkdir -p $RPM_BUILD_ROOT/etc/prelink.conf.d
+echo -e -- '-b /usr/bin/netplex-admin\n/usr/bin/ocamlrpcgen' \
+  > $RPM_BUILD_ROOT/etc/prelink.conf.d/ocaml-ocamlnet.conf
 
 
 %clean
@@ -194,7 +201,9 @@
 %{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/stublibs/*.so.owner
 %{_datadir}/%{name}/
-%{_bindir}/*
+%{_bindir}/netplex-admin
+%{_bindir}/ocamlrpcgen
+%config(noreplace) /etc/prelink.conf.d/ocaml-ocamlnet.conf
 
 
 %files devel
@@ -233,6 +242,9 @@
 
 
 %changelog
+* Tue Sep  2 2008 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-7
+- Prevent RPM & prelink from stripping bytecode.
+
 * Wed Apr 23 2008 Richard W.M. Jones <rjones at redhat.com> - 2.2.9-6
 - Rebuild for OCaml 3.10.2