rpms/libguestfs/EL-5 0001-Tests-Don-t-test-block-size-in-statvfs-test.patch, NONE, 1.1 0002-Always-pass-mkswap-f-parameter.patch, NONE, 1.1 libguestfs.spec, 1.54, 1.55

[Richard W.M. Jones]

Author: rjones

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

Modified Files:
	libguestfs.spec 
Added Files:
	0001-Tests-Don-t-test-block-size-in-statvfs-test.patch 
	0002-Always-pass-mkswap-f-parameter.patch 
Log Message:
Incorporate upstream patches to fix some tests.

0001-Tests-Don-t-test-block-size-in-statvfs-test.patch:
 generator.ml |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE 0001-Tests-Don-t-test-block-size-in-statvfs-test.patch ---
>From a8a4ce2bd3fd021e063cb3b939b45059f07ed053 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Thu, 6 Aug 2009 18:40:59 +0100
Subject: [PATCH 1/2] Tests: Don't test block size in statvfs test.

The block size changes between kernel releases, causing
a false failure in the tests.  The error was:

test_statvfs_0: bsize was 65536, expected 131072
---
 src/generator.ml |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/generator.ml b/src/generator.ml
index 7ac4ac8..8b0fc66 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -1619,8 +1619,7 @@ This is the same as the C<lstat(2)> system call.");
 
   ("statvfs", (RStruct ("statbuf", "statvfs"), [String "path"]), 54, [],
    [InitSquashFS, Always, TestOutputStruct (
-      [["statvfs"; "/"]], [CompareWithInt ("namemax", 256);
-                           CompareWithInt ("bsize", 131072)])],
+      [["statvfs"; "/"]], [CompareWithInt ("namemax", 256)])],
    "get file system statistics",
    "\
 Returns file system statistics for any mounted file system.
-- 
1.6.2.5


0002-Always-pass-mkswap-f-parameter.patch:
 swap.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0002-Always-pass-mkswap-f-parameter.patch ---
>From 530a90d3d4d7d107f52ac8db90fdb86c4f3e1737 Mon Sep 17 00:00:00 2001
From: Richard Jones <rjones at trick.home.annexia.org>
Date: Thu, 6 Aug 2009 18:46:57 +0100
Subject: [PATCH 2/2] Always pass mkswap -f parameter.

Otherwise mkswap will give a silly error if you ask it to
swap on a whole device.
---
 daemon/swap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/swap.c b/daemon/swap.c
index db93e57..3ebdef6 100644
--- a/daemon/swap.c
+++ b/daemon/swap.c
@@ -34,9 +34,9 @@ mkswap (char *device, const char *flag, const char *value)
   int r;
 
   if (!flag)
-    r = command (NULL, &err, "/sbin/mkswap", device, NULL);
+    r = command (NULL, &err, "/sbin/mkswap", "-f", device, NULL);
   else
-    r = command (NULL, &err, "/sbin/mkswap", flag, value, device, NULL);
+    r = command (NULL, &err, "/sbin/mkswap", "-f", flag, value, device, NULL);
 
   if (r == -1) {
     reply_with_error ("mkswap: %s", err);
-- 
1.6.2.5



Index: libguestfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libguestfs/EL-5/libguestfs.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- libguestfs.spec	6 Aug 2009 16:15:17 -0000	1.54
+++ libguestfs.spec	6 Aug 2009 17:50:27 -0000	1.55
@@ -5,13 +5,16 @@ Summary:     Access and modify virtual m
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.66
-Release:     2%{?dist}
+Release:     3%{?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:      0001-Tests-Don-t-test-block-size-in-statvfs-test.patch
+Patch1:      0002-Always-pass-mkswap-f-parameter.patch
+
 # Currently fails on PPC because:
 # "No Package Found for kernel"
 ExclusiveArch: %{ix86} x86_64
@@ -306,6 +309,9 @@ Requires:    jpackage-utils
 
 mkdir -p daemon/m4
 
+%patch0 -p1
+%patch1 -p1
+
 
 %build
 %if %{buildnonet}
@@ -533,8 +539,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-1
+* Thu Aug  6 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.66-3
 - New upstream release 1.0.66.
+- Incorporate upstream patches to fix some tests.
 
 * Wed Jul 29 2009 Richard W.M. Jones <rjones at redhat.com> - 1.0.65-2
 - New upstream release 1.0.65.