- New upstream version 1.5.13.

- Removed the patch workaround for RHBZ#630583.  The same workaround
  is now upstream (the bug is not fixed).

.gitignore

@@ -9,3 +9,4 @@ libguestfs-1.5.3.tar.gz
 /libguestfs-1.5.10.tar.gz
 /libguestfs-1.5.11.tar.gz
 /libguestfs-1.5.12.tar.gz
+/libguestfs-1.5.13.tar.gz

libguestfs-1.5.8-rhbz630583-no-set-scheduler-noop.patch

@@ -1,13 +0,0 @@
-diff --git a/appliance/init b/appliance/init
-index cda6453..becc396 100755
---- a/appliance/init
-+++ b/appliance/init
-@@ -67,7 +67,7 @@ lvm vgchange -ay --ignorelockingfailure
- for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
- 
- # http://kbase.redhat.com/faq/docs/DOC-5428
--for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
-+#for f in /sys/block/[hsv]d*/queue/scheduler; do echo noop > $f; done
- 
- # These are useful when debugging.
- if grep -sq guestfs_verbose=1 /proc/cmdline; then

libguestfs.spec

@@ -41,7 +41,7 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.5.12
+Version:       1.5.13
 Release:       1%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
@@ -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
 
-# Workaround for bug 630583: kernel hangs setting scheduler to noop.
-Patch1:        libguestfs-1.5.8-rhbz630583-no-set-scheduler-noop.patch
-
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -413,7 +410,6 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -743,6 +739,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 13 2010 Richard Jones <rjones@redhat.com> - 1:1.5.13-1
+- New upstream version 1.5.13.
+- Removed the patch workaround for RHBZ#630583.  The same workaround
+  is now upstream (the bug is not fixed).
+
 * Sat Sep 11 2010 Richard Jones <rjones@redhat.com> - 1:1.5.12-1
 - New upstream version 1.5.12.
 

sources

@@ -1 +1 @@
-2e98ccae09302983de486f48b7ad4923  libguestfs-1.5.12.tar.gz
+226f9e34dc31532234da147d8d4dc92d  libguestfs-1.5.13.tar.gz