From 36e243983b67cd96a2022bae5bdb99302dfda9f7 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: Jul 23 2009 11:48:01 +0000
Subject: Workaround for RHEL 5 bug with squashfs filesystems.


---

diff --git a/libguestfs-1.0.64-rhel-5-squashfs.patch b/libguestfs-1.0.64-rhel-5-squashfs.patch
new file mode 100644
index 0000000..303f508
--- /dev/null
+++ b/libguestfs-1.0.64-rhel-5-squashfs.patch
@@ -0,0 +1,25 @@
+From 9af502eff08017941a58ad676d0cbb867f83a341 Mon Sep 17 00:00:00 2001
+From: Richard Jones <rjones@trick.home.annexia.org>
+Date: Thu, 23 Jul 2009 12:45:12 +0100
+Subject: [PATCH] RHEL 5 thinks squashfs is HFS+ filesystem, unless we specify the type explicitly.
+
+---
+ regressions/test-read_file.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/regressions/test-read_file.sh b/regressions/test-read_file.sh
+index 33759b8..5840da3 100755
+--- a/regressions/test-read_file.sh
++++ b/regressions/test-read_file.sh
+@@ -25,7 +25,7 @@ rm -f test.out
+ ../fish/guestfish <<'EOF' > test.out
+ add-ro ../images/test.sqsh
+ run
+-mount /dev/sda /
++mount-vfs ro squashfs /dev/sda /
+ read-file /helloworld.tar
+ EOF
+ 
+-- 
+1.6.2.5
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 78f980d..23dd3fa 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -5,13 +5,15 @@ Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.64
-Release:     1%{?dist}
+Release:     2%{?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
 
+Patch0:      libguestfs-1.0.64-rhel-5-squashfs.patch
+
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -306,6 +308,8 @@ Requires:    jpackage-utils
 
 mkdir -p daemon/m4
 
+%patch0 -p1
+
 
 %build
 %if %{buildnonet}
@@ -533,9 +537,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Jul 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.64-1
+* Thu Jul 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.64-2
 - New upstream release 1.0.64.
 - New tool 'libguestfs-test-tool'.
+- Workaround for RHEL 5 bug with squashfs filesystems.
 
 * Wed Jul 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.61-6
 - New upstream release 1.0.61.