From ab187ffb5e62832a1efacb0d46d57e27fccb430c Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: Sep 15 2009 09:05:04 +0000
Subject: New upstream version 1.0.69.


---

diff --git a/.cvsignore b/.cvsignore
index f5c1eac..f3cf15c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libguestfs-1.0.68.tar.gz
+libguestfs-1.0.69.tar.gz
diff --git a/0001-tests-Found-three-more-references-to-the-squashfs.patch b/0001-tests-Found-three-more-references-to-the-squashfs.patch
deleted file mode 100644
index 8112d41..0000000
--- a/0001-tests-Found-three-more-references-to-the-squashfs.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0c92c583d5291e1a3a966b36f107bf48e4bfad93 Mon Sep 17 00:00:00 2001
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Wed, 19 Aug 2009 21:37:56 +0100
-Subject: [PATCH] tests: Found three more references to the squashfs, replaced with ISO.
-
----
- perl/t/510-lib-file-arch.t                         |    4 ++--
- .../test-cancellation-download-librarycancels.sh   |    4 ++--
- regressions/test-read_file.sh                      |    4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/perl/t/510-lib-file-arch.t b/perl/t/510-lib-file-arch.t
-index c4b9d31..5c70449 100644
---- a/perl/t/510-lib-file-arch.t
-+++ b/perl/t/510-lib-file-arch.t
-@@ -35,7 +35,7 @@ use Sys::Guestfs::Lib;
- my $h = Sys::Guestfs->new ();
- ok ($h);
- 
--$h->add_drive_ro ("../images/test.sqsh");
-+$h->add_drive_ro ("../images/test.iso");
- ok (1);
- 
- $h->launch ();
-@@ -43,7 +43,7 @@ ok (1);
- $h->wait_ready ();
- ok (1);
- 
--$h->mount_vfs ("ro", "squashfs", "/dev/sda", "/");
-+$h->mount_ro ("/dev/sda", "/");
- ok (1);
- 
- is (Sys::Guestfs::Lib::file_architecture ($h, "/bin-i586-dynamic"),
-diff --git a/regressions/test-cancellation-download-librarycancels.sh b/regressions/test-cancellation-download-librarycancels.sh
-index b0d78c9..73c5469 100755
---- a/regressions/test-cancellation-download-librarycancels.sh
-+++ b/regressions/test-cancellation-download-librarycancels.sh
-@@ -25,10 +25,10 @@ set -e
- rm -f test.img
- 
- ../fish/guestfish <<'EOF'
--add ../images/test.sqsh
-+add ../images/test.iso
- run
- 
--mount-vfs ro squashfs /dev/sda /
-+mount-ro /dev/sda /
- 
- # Download a file to /dev/full.
- echo "Expect: write: /dev/full: No space left on device"
-diff --git a/regressions/test-read_file.sh b/regressions/test-read_file.sh
-index 5840da3..3b9c6ef 100755
---- a/regressions/test-read_file.sh
-+++ b/regressions/test-read_file.sh
-@@ -23,9 +23,9 @@ set -e
- rm -f test.out
- 
- ../fish/guestfish <<'EOF' > test.out
--add-ro ../images/test.sqsh
-+add-ro ../images/test.iso
- run
--mount-vfs ro squashfs /dev/sda /
-+mount-ro /dev/sda /
- read-file /helloworld.tar
- EOF
- 
--- 
-1.6.2.5
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 78ea934..7ab1b81 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -4,17 +4,14 @@
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
-Version:     1.0.68
-Release:     5%{?dist}
+Version:     1.0.69
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
 Source0:     http://libguestfs.org/download/%{name}-%{version}.tar.gz
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root
 
-# This patch upstream in 1.0.69.
-Patch0:      0001-tests-Found-three-more-references-to-the-squashfs.patch
-
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -310,8 +307,6 @@ Requires:    jpackage-utils
 %prep
 %setup -q
 
-%patch0 -p1
-
 mkdir -p daemon/m4
 
 
@@ -541,6 +536,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.69-1
+- New upstream release 1.0.69.
+- New main loop code should fix RHBZ#501888, RHBZ#504418.
+- Add waitpid along guestfs_close path (fixes RHBZ#518747).
+- Remove fix-tests patch which is now upstream.
+
 * Wed Aug 19 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.68-5
 - New upstream release 1.0.68.
 - BR mkisofs.
diff --git a/sources b/sources
index b4c52aa..faf1c84 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2999a99a99417ad349b4a6d6b4480fe5  libguestfs-1.0.68.tar.gz
+e90d40fd9c36231c4ed39c4aa6a77704  libguestfs-1.0.69.tar.gz