[hivex] - Disable OCaml on ppc64. - Ensure OCaml files are deleted when not packaged.
Richard W.M. Jones
rjones at fedoraproject.org
Thu Dec 8 18:22:19 UTC 2011
commit 358b13edb46543a3d4d585cc28337b435fc8342f
Author: Richard Jones <rjones at redhat.com>
Date: Thu Dec 8 19:21:34 2011 +0100
- Disable OCaml on ppc64.
- Ensure OCaml files are deleted when not packaged.
hivex.spec | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/hivex.spec b/hivex.spec
index b4abbfe..d30629d 100644
--- a/hivex.spec
+++ b/hivex.spec
@@ -1,5 +1,5 @@
# conditionalize Ocaml support
-%ifarch sparc64 s390 s390x
+%ifarch ppc64 sparc64 s390 s390x
%bcond_with ocaml
%else
%bcond_without ocaml
@@ -7,7 +7,7 @@
Name: hivex
Version: 1.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Read and write Windows Registry binary hive files
Group: Development/Libraries
@@ -173,6 +173,14 @@ make %{?_smp_mflags}
%check
make check
+%if !%{with ocaml}
+# Delete OCaml files, in case the user had OCaml installed and it was
+# picked up by the configure script.
+# XXX Add ./configure --disable-ocaml upstream.
+rm -rf $RPM_BUILD_ROOT%{_libdir}/ocaml/hivex
+rm -f $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*hivex*
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -275,6 +283,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Dec 8 2011 Richard W.M. Jones <rjones at redhat.com> - 1.3.3-2
+- Disable OCaml on ppc64.
+- Ensure OCaml files are deleted when not packaged.
+
* Tue Nov 29 2011 Richard W.M. Jones <rjones at redhat.com> - 1.3.3-1
- New upstream version 1.3.3.
- Rebased gnulib to work around RHBZ#756981.
More information about the scm-commits
mailing list