[libguestfs/f15/master] - New upstream stable branch 1.10.0. - New Source URL. - Remove patches which are now upstream.

[Richard W.M. Jones]

commit fb8820354598610755c8d144ac45b9633776f21f
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Apr 12 21:55:03 2011 +0100

    - New upstream stable branch 1.10.0.
    - New Source URL.
    - Remove patches which are now upstream.

 .gitignore                                         |    1 +
 0001-resize-Link-with-local-copy-of-guestfs.patch  |   31 ---------------
 0002-resize-Missing-n-after-version.patch          |   25 ------------
 ...ize-Consistent-use-of-part-in-help-output.patch |   41 --------------------
 ...ze-Don-t-build-this-directory-in-parallel.patch |   24 -----------
 libguestfs.spec                                    |   21 ++++------
 sources                                            |    2 +-
 7 files changed, 10 insertions(+), 135 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 756675a..fc3fd6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.9.16.tar.gz
 /libguestfs-1.9.17.tar.gz
 /libguestfs-1.9.18.tar.gz
+/libguestfs-1.10.0.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index ab073cc..e900096 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -29,23 +29,17 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.9.18
-Release:       4%{?dist}
+Version:       1.10.0
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
-Source0:       http://libguestfs.org/download/1.9-development/%{name}-%{version}.tar.gz
+Source0:       http://libguestfs.org/download/1.10-development/%{name}-%{version}.tar.gz
 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
 
-# Patch upstream in > 1.9.18.
-Patch1:        0001-resize-Link-with-local-copy-of-guestfs.patch
-Patch2:        0002-resize-Missing-n-after-version.patch
-Patch3:        0003-resize-Consistent-use-of-part-in-help-output.patch
-Patch4:        0004-resize-Don-t-build-this-directory-in-parallel.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -440,10 +434,6 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 mkdir -p daemon/m4
 
@@ -782,6 +772,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 12 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.10.0-1
+- New upstream stable branch 1.10.0.
+- New Source URL.
+- Remove patches which are now upstream.
+
 * Sun Apr 10 2011 Richard W.M. Jones <rjones at redhat.com> - 1:1.9.18-4
 - Include further fixes to virt-resize from upstream.
 
diff --git a/sources b/sources
index b62dbca..c52f1c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eae14df1f709355d012527588b010038  libguestfs-1.9.18.tar.gz
+1f97ec60ddd7ec5b019eb9d7ddb5c2c2  libguestfs-1.10.0.tar.gz