[libguestfs/f15/master] - New upstream version 1.9.10. - Remove patches (now upstream). (cherry picked from commit f16e05cf8

Richard W.M. Jones rjones at fedoraproject.org
Tue Mar 8 16:52:18 UTC 2011


commit 88f2dc8d992d14784992e57707d96e2197d73aed
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Mar 8 16:46:14 2011 +0000

    - New upstream version 1.9.10.
    - Remove patches (now upstream).
    (cherry picked from commit f16e05cf8ad23eed40b1178da820b615ca36bff5)

 .gitignore                                         |    1 +
 ...s-In-debug-mode-print-qemu-img-command-li.patch |   26 -----------------
 ...s-Round-disk-size-to-integer-fix-for-qemu.patch |   29 --------------------
 libguestfs.spec                                    |   13 +++-----
 sources                                            |    2 +-
 5 files changed, 7 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 904789d..feda9dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.9.7.tar.gz
 /libguestfs-1.9.8.tar.gz
 /libguestfs-1.9.9.tar.gz
+/libguestfs-1.9.10.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index 7e7fe65..7c25b69 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,7 +29,7 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.9.9
+Version:       1.9.10
 Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
@@ -40,11 +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 patches to fix virt-make-fs with qemu-img 0.14.
-# These are included after 0.9.9.
-Patch1:        0001-virt-make-fs-In-debug-mode-print-qemu-img-command-li.patch
-Patch2:        0002-virt-make-fs-Round-disk-size-to-integer-fix-for-qemu.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -431,8 +426,6 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 mkdir -p daemon/m4
 
@@ -765,6 +758,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar  8 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.9.10-1
+- New upstream version 1.9.10.
+- Remove patches (now upstream).
+
 * Fri Mar  4 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.9.9-2
 - Include upstream patches to fix virt-make-fs with qemu-img 0.14.
 
diff --git a/sources b/sources
index bf26a06..dc2a50e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8d111b1272be10aa39b6ecc3a269e6c  libguestfs-1.9.9.tar.gz
+983f0477185ac4cbf60aa37fcb05656f  libguestfs-1.9.10.tar.gz


More information about the scm-commits mailing list