rpms/virt-df/devel virt-df-2.1.4-camlp4-parse.patch, NONE, 1.1 virt-df.spec, 1.7, 1.8

Richard W.M. Jones rjones at fedoraproject.org
Fri Dec 5 16:34:25 UTC 2008


Author: rjones

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

Modified Files:
	virt-df.spec 
Added Files:
	virt-df-2.1.4-camlp4-parse.patch 
Log Message:
Patch to fix camlp4 parsing problem in 3.11.0.

virt-df-2.1.4-camlp4-parse.patch:

--- NEW FILE virt-df-2.1.4-camlp4-parse.patch ---
--- virt-df-2.1.4.orig/lib/int63_on_64.ml	2008-10-21 09:42:53.000000000 +0100
+++ virt-df-2.1.4/lib/int63_on_64.ml	2008-12-05 16:26:15.000000000 +0000
@@ -41,7 +41,7 @@
 
 let zero = 0
 let one = 1
-let minus_one = ~1
+let minus_one = 0-1
 
 external neg : int -> int = "%negint"
 


Index: virt-df.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-df/devel/virt-df.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- virt-df.spec	21 Oct 2008 09:58:47 -0000	1.7
+++ virt-df.spec	5 Dec 2008 16:33:54 -0000	1.8
@@ -4,7 +4,7 @@
 
 Name:           virt-df
 Version:        2.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utility like 'df' for virtual guests
 
 Group:          Development/Libraries
@@ -14,6 +14,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:         virt-df-2.1.4-bogus-zh_CN-plurals.patch
+Patch1:         virt-df-2.1.4-camlp4-parse.patch
 
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-ocamldoc
@@ -50,6 +51,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -98,6 +100,9 @@
 
 
 %changelog
+* Fri Nov  5 2008 Richard W.M. Jones <rjones at redhat.com> - 2.1.4-3
+- Patch to fix camlp4 parsing problem in 3.11.0.
+
 * Tue Oct 21 2008 Richard W.M. Jones <rjones at redhat.com> - 2.1.4-2
 - Fix incorrect sources file.
 - Remove bogus Plural-Forms line from zh_CN PO file.




More information about the fedora-extras-commits mailing list