[libguestfs/f14/master] Version 1.6.2.

[Richard W.M. Jones]

commit b93be4b0437135b1368dfa63fb1537414ff59580
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Nov 18 13:17:54 2010 +0000

    Version 1.6.2.

 .gitignore                                         |    1 +
 ...rate-failure-of-blockdev-rereadpt-after-s.patch |   28 --------------------
 libguestfs.spec                                    |   19 +++++--------
 sources                                            |    2 +-
 4 files changed, 9 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0554eb2..deb40fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ libguestfs-1.5.2.tar.gz
 /libguestfs-1.5.21.tar.gz
 /libguestfs-1.5.23.tar.gz
 /libguestfs-1.6.0.tar.gz
+/libguestfs-1.6.2.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index 382af3c..3cc42a9 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -41,8 +41,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.6.0
-Release:       1%{?dist}.1
+Version:       1.6.2
+Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,9 +52,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 # Disable FUSE tests, not supported in Koji at the moment.
 Patch0:        libguestfs-1.0.79-no-fuse-test.patch
 
-# Backport upstream patch to tolerate blockdev --rereadpt failure.
-Patch1:        0001-daemon-Tolerate-failure-of-blockdev-rereadpt-after-s.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -416,7 +413,6 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -574,12 +570,6 @@ if [ "$RPM_BUILD_ROOT%{python_sitearch}" != "$RPM_BUILD_ROOT%{python_sitelib}" ]
      $RPM_BUILD_ROOT%{python_sitelib}/
 fi
 
-# Install ruby bindings by hand.
-mkdir -p $RPM_BUILD_ROOT%{ruby_sitelib}
-mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}
-install -p -m0644 ruby/lib/guestfs.rb $RPM_BUILD_ROOT%{ruby_sitelib}
-install -p -m0755 ruby/ext/guestfs/_guestfs.so $RPM_BUILD_ROOT%{ruby_sitearch}
-
 # Remove static-linked Java bindings.
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.a
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.la
@@ -747,6 +737,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 18 2010 Richard Jones <rjones at redhat.com> - 1:1.6.2-1
+- New upstream stable branch version 1.6.2.
+- This version includes a make install rule that works for Ruby, so
+  we can remove those instructions in the install section.
+
 * Tue Nov  2 2010 Richard Jones <rjones at redhat.com> - 1:1.6.0-1.fc14.1
 - New upstream stable branch 1.6, version 1.6.0.
 - virt-inspector now requires db_dump from db4-utils package.
diff --git a/sources b/sources
index f1a045a..1d800d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7a0aa8802a564f613ce77eeff4f64c9a  libguestfs-1.6.0.tar.gz
+3626a64d8d88703e3324a71e7a7ff31e  libguestfs-1.6.2.tar.gz