From 7e7c73ffc8b81c601ba035b36e333c45d1f2db02 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 21 Mar 2012 15:44:33 +0000
Subject: [PATCH] Version 0.7.1.

---
 configure.ac     |  2 +-
 whenjobs.spec.in | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 94a3ce5..7c99e34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-AC_INIT([whenjobs],[0.7.0])
+AC_INIT([whenjobs],[0.7.1])
 AM_INIT_AUTOMAKE([foreign])
 
 dnl Only used temporarily while whenjobs.spec is contained in the
diff --git a/whenjobs.spec.in b/whenjobs.spec.in
index 8b663e4..2fb2fb3 100644
--- a/whenjobs.spec.in
+++ b/whenjobs.spec.in
@@ -1,9 +1,6 @@
 %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
 %define debug_package %{nil}
 
-# Prevent unwanted bytecode stripping by RPM.
-%define __strip /bin/true
-
 Name:            @PACKAGE_NAME@
 Version:         @PACKAGE_VERSION@
 Release:         @RPM_RELEASE@%{?dist}
@@ -65,27 +62,26 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Add a prelink blacklist.
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d
-cat <<EOF >$RPM_BUILD_ROOT/%{_sysconfdir}/prelink.conf.d/%{name}.conf
--b %{_bindir}/whenjobs
--b %{_sbindir}/whenjobsd
-EOF
+# Remove bytecode library.
+rm $RPM_BUILD_ROOT%{_libdir}/whenjobs/whenlib.cma
+
+# Strip binaries (why doesn't RPM do this?)
+strip --strip-all $RPM_BUILD_ROOT%{_bindir}/whenjobs
+strip --strip-all $RPM_BUILD_ROOT%{_sbindir}/whenjobsd
 
 
 %files
 %doc COPYING README
-%{_sysconfdir}/prelink.conf.d/%{name}.conf
 %{_bindir}/whenjobs
 %{_sbindir}/whenjobsd
 %dir %{_libdir}/whenjobs
 %{_libdir}/whenjobs/*.cmi
 %{_libdir}/whenjobs/pa_when.cmo
-%{_libdir}/whenjobs/whenlib.cma
+%{_libdir}/whenjobs/whenlib.cmxa
 %{_mandir}/man1/*.1*
 %{_mandir}/man8/*.8*
 
 
 %changelog
-* Sun Mar 18 2012 Richard W.M. Jones <rjones@redhat.com> - @PACKAGE_VERSION@-@RPM_RELEASE@
+* Wed Mar 21 2012 Richard W.M. Jones <rjones@redhat.com> - @PACKAGE_VERSION@-@RPM_RELEASE@
 - Initial release.
-- 
1.8.3.1