[libguestfs/f15] - New upstream stable branch 1.10.6. - Remove patch, now upstream.

Richard W.M. Jones rjones at fedoraproject.org
Wed Jul 27 15:52:08 UTC 2011


commit da5f024253bb6c870c94e4c2ece79edbf0a090a3
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Jul 27 16:51:28 2011 +0100

    - New upstream stable branch 1.10.6.
    - Remove patch, now upstream.

 .gitignore                                      |    1 +
 0001-ocaml-Fix-locking-in-event-callbacks.patch |   58 -----------------------
 libguestfs.spec                                 |   14 +++---
 sources                                         |    2 +-
 4 files changed, 9 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 879fd04..407ab2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.10.3.tar.gz
 /libguestfs-1.10.4.tar.gz
 /libguestfs-1.10.5.tar.gz
+/libguestfs-1.10.6.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index 0ea1c06..687d9c0 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,8 +29,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.10.5
-Release:       2%{?dist}
+Version:       1.10.6
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -40,9 +40,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.7.13-no-fuse-test.patch
 
-# Upstream patch to fix segfault in OCaml bindings.
-Patch1:        0001-ocaml-Fix-locking-in-event-callbacks.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -439,7 +436,6 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -778,7 +774,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Jul 26 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.10.5-2
+* Wed Jul 27 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.10.6-1
+- New upstream stable branch 1.10.6.
+- Remove patch, now upstream.
+
+* Tue Jul 26 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.10.5-2
 - Add upstream patch to fix segfault in OCaml bindings (RHBZ#725824).
 
 * Wed Jul 13 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.10.5-1
diff --git a/sources b/sources
index 1cff743..a462f61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15d2eb6b813f051fc744a490602e00e7  libguestfs-1.10.5.tar.gz
+a44172de0d4578d070c25c0b1a8fd99f  libguestfs-1.10.6.tar.gz


More information about the scm-commits mailing list