diff --git a/ocaml-ocamlnet.spec b/ocaml-ocamlnet.spec index 80d446f..e3aa7f0 100644 --- a/ocaml-ocamlnet.spec +++ b/ocaml-ocamlnet.spec @@ -1,8 +1,17 @@ %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) +# Prevent RPM from stripping the binaries. +# +# NB: Only required because this package uses the obsolete -custom +# parameter and builds a bytecode 'ocamlrpcgen'. I tried to fix the +# build to make a native code 'ocamlrpcgen' but the build system got +# the better of me. +%define __strip /bin/true +%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) + Name: ocaml-ocamlnet Version: 3.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Network protocols for OCaml License: BSD @@ -131,6 +140,11 @@ make install # be deleted safely. This avoids an rpmlint warning. rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/rpc-generator/dummy.mli +# NB. Do NOT strip the binaries and prevent prelink from stripping them too. +# See comment at top of spec file. +mkdir -p $RPM_BUILD_ROOT/etc/prelink.conf.d +echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \ + > $RPM_BUILD_ROOT/etc/prelink.conf.d/ocaml-ocamlnet.conf %files %doc ChangeLog RELNOTES @@ -167,6 +181,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/rpc-generator/dummy.mli %{_datadir}/%{name}/ %{_bindir}/netplex-admin %{_bindir}/ocamlrpcgen +%config(noreplace) /etc/prelink.conf.d/ocaml-ocamlnet.conf %files devel @@ -204,6 +219,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/rpc-generator/dummy.mli %changelog +* Thu Sep 19 2013 Richard W.M. Jones - 3.7.3-2 +- Unfortunately we have to re-add the anti-stripping code back. See + comment at top of spec file. + * Sat Sep 14 2013 Richard W.M. Jones - 3.7.3-1 - New upstream version 3.7.3. - Rebuild for OCaml 4.01.0.