[libguestfs/f16] Remove upstream patch to fix OCaml locking in event callbacks.

Richard W.M. Jones rjones at fedoraproject.org
Sun Aug 7 23:51:14 UTC 2011


commit 2dd6da4b28c41f3f585e01c51c91e1599580740b
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Aug 8 00:50:18 2011 +0100

    Remove upstream patch to fix OCaml locking in event callbacks.

 0001-ocaml-Fix-locking-in-event-callbacks.patch |   79 -----------------------
 libguestfs.spec                                 |    9 +--
 2 files changed, 3 insertions(+), 85 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 5814b65..25d5591 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -30,7 +30,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.12.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -48,9 +48,6 @@ Patch2:        libguestfs-1.12.0-configure-force-machine-accel-tcg.patch
 # option so that this patch would not be needed.
 Patch3:        0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch
 
-# Upstream patch to fix segfault in OCaml bindings.
-Patch4:        0001-ocaml-Fix-locking-in-event-callbacks.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -504,7 +501,6 @@ for %{name}.
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 mkdir -p daemon/m4
 
@@ -870,8 +866,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Aug  8 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.12.3-1
+* Mon Aug  8 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.12.3-2
 - New upstream stable branch version 1.12.3.
+- Remove upstream patch to fix OCaml locking in event callbacks.
 
 * Tue Jul 26 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.12.1-4
 - New upstream stable branch version 1.12.1.


More information about the scm-commits mailing list