[fedora-virt-maint] rpms/libguestfs/EL-5 libguestfs-1.0.64-rhel-5-squashfs.patch, NONE, 1.1 libguestfs.spec, 1.49, 1.50

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/libguestfs/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9542

Modified Files:
	libguestfs.spec 
Added Files:
	libguestfs-1.0.64-rhel-5-squashfs.patch 
Log Message:
Workaround for RHEL 5 bug with squashfs filesystems.

libguestfs-1.0.64-rhel-5-squashfs.patch:
 test-read_file.sh |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE libguestfs-1.0.64-rhel-5-squashfs.patch ---
>From 9af502eff08017941a58ad676d0cbb867f83a341 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at 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



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- libguestfs.spec	23 Jul 2009 10:44:24 -0000	1.49
+++ libguestfs.spec	23 Jul 2009 11:48:01 -0000	1.50
@@ -5,13 +5,15 @@ Summary:     Access and modify virtual m
 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 at redhat.com> - 1.0.64-1
+* Thu Jul 23 2009 Richard W.M. Jones <rjones at 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 at redhat.com> - 1.0.61-6
 - New upstream release 1.0.61.