commit b0abb4748b852d5afa5581f116f152727df37c2e
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Sat Aug 2 17:34:10 2014 +0100
Do not warn about immutable strings.
virt-top-no-immutable-warning.patch | 16 ++++++++++++++++
virt-top.spec | 13 +++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/virt-top-no-immutable-warning.patch b/virt-top-no-immutable-warning.patch
new file mode 100644
index 0000000..cbf6529
--- /dev/null
+++ b/virt-top-no-immutable-warning.patch
@@ -0,0 +1,16 @@
+--- virt-top-1.0.8.old/virt-top/Makefile.in 2012-03-06 11:32:12.000000000 +0000
++++ virt-top-1.0.8/virt-top/Makefile.in 2014-08-02 17:31:41.146930514 +0100
+@@ -64,11 +64,11 @@
+
+ XOBJS := $(OBJS:.cmo=.cmx)
+
+-OCAMLCFLAGS := -g -warn-error A
++OCAMLCFLAGS := -g -warn-error A-3
+ OCAMLCLIBS := -linkpkg
+
+ OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
+-OCAMLOPTFLAGS := -warn-error A
++OCAMLOPTFLAGS := -warn-error A-3
+ OCAMLOPTLIBS := $(OCAMLCLIBS)
+
+ BYTE_TARGETS := virt-top
diff --git a/virt-top.spec b/virt-top.spec
index 0dfde37..227acbc 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -3,13 +3,15 @@
Name: virt-top
Version: 1.0.8
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Utility like top(1) for displaying virtualization stats
License: GPLv2+
URL: http://people.redhat.com/~rjones/virt-top/
Source0: http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
+ExcludeArch: sparc64 s390 s390x
+
%if 0%{?rhel} >= 6
# Post-process output of CSV file (RHBZ#665817, RHBZ#912020).
Source1: processcsv.py
@@ -20,7 +22,9 @@ Patch0: virt-top-1.0.4-processcsv-documentation.patch
# Update configure for aarch64 (bz #926701)
Patch1: virt-top-aarch64.patch
-ExcludeArch: sparc64 s390 s390x
+
+# Don't warn about immutable strings (OCaml 4.02).
+Patch2: virt-top-no-immutable-warning.patch
BuildRequires: ocaml >= 3.10.2
BuildRequires: ocaml-ocamldoc
@@ -70,6 +74,8 @@ different virtualization systems.
# Update configure for aarch64 (bz #926701)
%patch1 -p1
+%patch2 -p1
+
chmod -x COPYING
@@ -136,6 +142,9 @@ install -m 0644 processcsv.py.1 $RPM_BUILD_ROOT%{_mandir}/man1/
%changelog
+* Sat Aug 02 2014 Richard W.M. Jones <rjones at redhat.com> - 1.0.8-9
+- Do not warn about immutable strings.
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild