rpms/virt-mem/devel virt-mem-0.3.1-bitstring2.patch, NONE, 1.1 virt-mem-0.3.1-dynlink.patch, NONE, 1.1 virt-mem.spec, 1.5, 1.6

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/virt-mem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19844

Modified Files:
	virt-mem.spec 
Added Files:
	virt-mem-0.3.1-bitstring2.patch virt-mem-0.3.1-dynlink.patch 
Log Message:
* Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.3.1-4
- Rebuild for OCaml 3.11.0.
- Fix for bitstring 2.0.0.
- Fix for dynlink.cma dep on camlp4.


virt-mem-0.3.1-bitstring2.patch:

--- NEW FILE virt-mem-0.3.1-bitstring2.patch ---
--- virt-mem-0.3.1.orig/lib/virt_mem_dump.ml	2008-08-17 12:30:04.000000000 +0100
+++ virt-mem-0.3.1/lib/virt_mem_dump.ml	2008-12-05 19:50:27.000000000 +0000
@@ -80,9 +80,9 @@
 
   while !len > 0 do
     let bits = min !len 8 in
-    let byte, off', len' =
+    let byte =
       Bitstring.extract_char_unsigned data !off !len bits in
-    off := off'; len := len';
+    off := !off + bits; len := !len + bits;
 
     let byte = byte lsl (8-bits) in
     fprintf chan "%02x " byte;

virt-mem-0.3.1-dynlink.patch:

--- NEW FILE virt-mem-0.3.1-dynlink.patch ---
--- virt-mem-0.3.1.orig/extract/codegen/Makefile.in	2008-08-17 14:18:59.000000000 +0100
+++ virt-mem-0.3.1/extract/codegen/Makefile.in	2008-12-05 19:54:36.000000000 +0000
@@ -27,11 +27,11 @@
 OCAMLCPACKAGES	= -package extlib,pcre,unix,camlp4,bitstring -pp camlp4of
 
 OCAMLCFLAGS	= @OCAMLCFLAGS@
-OCAMLCLIBS	= -linkpkg camlp4lib.cma
+OCAMLCLIBS	= -linkpkg dynlink.cma camlp4lib.cma
 
 OCAMLOPTFLAGS	= @OCAMLOPTFLAGS@
 OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
-OCAMLOPTLIBS	= -linkpkg camlp4lib.cmxa
+OCAMLOPTLIBS	= -linkpkg dynlink.cmxa camlp4lib.cmxa
 
 TARGETS		= compile-kerneldb.opt
 


Index: virt-mem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-mem/devel/virt-mem.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- virt-mem.spec	5 Dec 2008 17:58:01 -0000	1.5
+++ virt-mem.spec	5 Dec 2008 20:05:57 -0000	1.6
@@ -3,7 +3,7 @@
 
 Name:           virt-mem
 Version:        0.3.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Management tools for virtual machines
 
 Group:          Development/Libraries
@@ -12,6 +12,9 @@
 Source0:        http://et.redhat.com/~rjones/virt-mem/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0:         virt-mem-0.3.1-bitstring2.patch
+Patch1:         virt-mem-0.3.1-dynlink.patch
+
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-findlib-devel
@@ -20,7 +23,7 @@
 BuildRequires:  ocaml-libvirt-devel >= 0.4.4.2
 BuildRequires:  ocaml-xml-light-devel
 BuildRequires:  ocaml-xmlrpc-light-devel
-BuildRequires:  ocaml-bitstring-devel >= 1.9.7
+BuildRequires:  ocaml-bitstring-devel >= 2.0.0
 BuildRequires:  ocaml-csv-devel
 BuildRequires:  ocaml-gettext-devel
 BuildRequires:  ocaml-pcre-devel
@@ -69,6 +72,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -103,8 +108,10 @@
 
 
 %changelog
-* Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.3.1-3
+* Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 0.3.1-4
 - Rebuild for OCaml 3.11.0.
+- Fix for bitstring 2.0.0.
+- Fix for dynlink.cma dep on camlp4.
 
 * Mon Aug 25 2008 Richard W.M. Jones <rjones at redhat.com> - 0.3.1-2
 - Forgot to add the new sources to previous release.