[packages/virt-top] rel 2; fix build

mmazur mmazur at pld-linux.org
Thu Mar 23 14:30:18 CET 2017


commit b173821dceeb91ce780492cd9ef8671766130fdc
Author: Mariusz Mazur <mmazur at axeos.com>
Date:   Thu Mar 23 14:26:41 2017 +0100

    rel 2; fix build

 makefile_fix.patch | 16 ++++++++++++++++
 virt-top.spec      |  8 +++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/virt-top.spec b/virt-top.spec
index 6775d7d..dc72a75 100644
--- a/virt-top.spec
+++ b/virt-top.spec
@@ -6,15 +6,16 @@
 Summary:	Utility like top(1) for displaying virtualization stats
 Name:		virt-top
 Version:	1.0.8
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://people.redhat.com/~rjones/virt-top/files/%{name}-%{version}.tar.gz
 # Source0-md5:	cdb61d35e64c78720082d58f8edfb9da
+Patch0:     makefile_fix.patch
 URL:		http://people.redhat.com/~rjones/virt-top/
 BuildRequires:	ocaml >= 3.10.2
 BuildRequires:	ocaml-findlib-devel
-BuildRequires:	ocaml-ocamldoc
+BuildRequires:	ocaml-ocamldoc-devel
 ExcludeArch:	sparc64 s390 s390x
 # Need the ncurses / ncursesw (--enable-widec) fix.
 BuildRequires:	ocaml-calendar-devel
@@ -26,7 +27,7 @@ BuildRequires:	ocaml-extlib-devel
 BuildRequires:	ocaml-libvirt-devel >= 0.6.1.2-5
 # Tortuous list of BRs for gettext.
 BuildRequires:	ocaml-fileutils-devel
-BuildRequires:	ocaml-gettext-tools >= 0.3.3
+BuildRequires:	ocaml-gettext-devel
 # For msgfmt:
 BuildRequires:	gettext
 # Non-OCaml BRs.
@@ -48,6 +49,7 @@ different virtualization systems.
 
 %prep
 %setup -q
+%patch0 -p1
 
 chmod -x COPYING
 
diff --git a/makefile_fix.patch b/makefile_fix.patch
new file mode 100644
index 0000000..4266165
--- /dev/null
+++ b/makefile_fix.patch
@@ -0,0 +1,16 @@
+--- virt-top-1.0.8/virt-top/Makefile.in~	2012-03-06 12:32:12.000000000 +0100
++++ virt-top-1.0.8/virt-top/Makefile.in	2017-03-21 17:15:44.275117838 +0100
+@@ -64,11 +64,11 @@
+ 
+ XOBJS		:= $(OBJS:.cmo=.cmx)
+ 
+-OCAMLCFLAGS	:= -g -warn-error A
++OCAMLCFLAGS	:= -g
+ OCAMLCLIBS	:= -linkpkg
+ 
+ OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
+-OCAMLOPTFLAGS	:= -warn-error A
++OCAMLOPTFLAGS	:=
+ OCAMLOPTLIBS	:= $(OCAMLCLIBS)
+ 
+ BYTE_TARGETS	:= virt-top
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/virt-top.git/commitdiff/b173821dceeb91ce780492cd9ef8671766130fdc



More information about the pld-cvs-commit mailing list