git.annexia.org
/
whenjobs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
32 bit: Fix for 31 bit int overflow in time_t.
[whenjobs.git]
/
whenjobs.spec.in
diff --git
a/whenjobs.spec.in
b/whenjobs.spec.in
index
cb52aa6
..
cdb3897
100644
(file)
--- a/
whenjobs.spec.in
+++ b/
whenjobs.spec.in
@@
-1,12
+1,9
@@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
-
-# Prevent unwanted bytecode stripping by RPM.
-%define __strip /bin/true
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
-Release: @RPM_RELEASE@
+Release: @RPM_RELEASE@
%{?dist}
Summary: Replacement for cron with dependencies
Group: Development/Libraries
Summary: Replacement for cron with dependencies
Group: Development/Libraries
@@
-26,7
+23,8
@@
BuildRequires: mailx
BuildRequires: /usr/bin/perldoc
# Not clear what requires this, but it is needed.
BuildRequires: /usr/bin/perldoc
# Not clear what requires this, but it is needed.
-BuildRequires: pcre-devel, ocaml-pcre-devel
+BuildRequires: pcre-devel
+BuildRequires: ocaml-pcre-devel
# Requires camlp4 and ocamlfind at runtime.
Requires: /usr/bin/ocamlc
# Requires camlp4 and ocamlfind at runtime.
Requires: /usr/bin/ocamlc
@@
-60,35
+58,34
@@
make check
%install
%install
-rm -rf $RPM_BUILD_ROOT
-
make DESTDIR=$RPM_BUILD_ROOT install
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
-
+%if %opt
+# Remove bytecode library.
+rm $RPM_BUILD_ROOT%{_libdir}/whenjobs/whenlib.cma
+%endif
-%clean
-rm -rf $RPM_BUILD_ROOT
+# 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
%files
-%defattr(-,root,root,-)
%doc COPYING README
%doc COPYING README
-%{_sysconfdir}/prelink.conf.d/%{name}.conf
%{_bindir}/whenjobs
%{_sbindir}/whenjobsd
%{_bindir}/whenjobs
%{_sbindir}/whenjobsd
+%dir %{_libdir}/whenjobs
%{_libdir}/whenjobs/*.cmi
%{_libdir}/whenjobs/pa_when.cmo
%{_libdir}/whenjobs/*.cmi
%{_libdir}/whenjobs/pa_when.cmo
+%if %opt
+%{_libdir}/whenjobs/whenlib.cmxa
+%else
%{_libdir}/whenjobs/whenlib.cma
%{_libdir}/whenjobs/whenlib.cma
+%endif
%{_mandir}/man1/*.1*
%{_mandir}/man8/*.8*
%changelog
%{_mandir}/man1/*.1*
%{_mandir}/man8/*.8*
%changelog
-*
Fri Feb 17
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.
- Initial release.