- Add patch to fix broken Perl test.

- Remove workaround for RHBZ#563103.

0001-perl-Ignore-debug-functions-in-Test-Pod-Coverage.patch

@@ -0,0 +1,25 @@
+From 3431f397d34740fcd3a2d6f94d03af6e5f8f1a36 Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones@redhat.com>
+Date: Thu, 11 Nov 2010 22:25:15 +0000
+Subject: [PATCH] perl: Ignore debug functions in Test::Pod::Coverage.
+
+---
+ perl/t/006-pod-coverage.t |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/perl/t/006-pod-coverage.t b/perl/t/006-pod-coverage.t
+index c648b34..61e7b96 100644
+--- a/perl/t/006-pod-coverage.t
++++ b/perl/t/006-pod-coverage.t
+@@ -21,4 +21,7 @@ use warnings;
+ 
+ eval "use Test::Pod::Coverage 1.00";
+ plan skip_all => "Test::Pod::Coverage 1.00 required for testing POD" if $@;
+-all_pod_coverage_ok ({also_private => [ qr/^test0.*/ ]});
++all_pod_coverage_ok ({
++    also_private => [ qr/^test0.*/,
++                      qr/^debug.*/ ]
++});
+-- 
+1.7.3.2
+

libguestfs.spec

@@ -42,7 +42,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.7.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -52,6 +52,9 @@ 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
 
+# Upstream patch to fix Perl tests, remove in 1.7.5.
+Patch1:        0001-perl-Ignore-debug-functions-in-Test-Pod-Coverage.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -412,6 +415,7 @@ php-%{name} contains PHP bindings for %{name}.
 %setup -q
 
 %patch0 -p1
+%patch1 -p1
 
 mkdir -p daemon/m4
 
@@ -484,28 +488,13 @@ export LIBGUESTFS_DEBUG=1
 # 548121   all          F-13   udevsettle command is broken (WORKAROUND)
 # 553689   all          F-13   missing SeaBIOS (FIXED)
 # 563103   all          F-13   glibc incorrect emulation of preadv/pwritev
-#                                 (WORKAROUND using LD_PRELOAD)
+#                                 (sort of FIXED)
 # 567567   32-bit       all    guestfish xstrtol test failure on 32-bit (FIXED)
 # 575734   all          F-14   microsecond resolution for blkid cache (FIXED)
 # 630583   all          all    kernel hangs setting scheduler to noop
 # 630777   all          F-15   task lvm blocked for more than 120 seconds
 #                                 (FIXED)
 
-# Workaround #563103
-cat > rhbz563103.c <<'EOF'
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-ssize_t preadv (int fd,...) { errno = ENOSYS; return -1; }
-ssize_t preadv64 (int fd,...) { errno = ENOSYS; return -1; }
-ssize_t pwritev (int fd,...) { errno = ENOSYS; return -1; }
-ssize_t pwritev64 (int fd,...) { errno = ENOSYS; return -1; }
-EOF
-gcc -fPIC -c rhbz563103.c
-gcc -shared -Wl,-soname,rhbz563103.so.1 rhbz563103.o -o rhbz563103.so
-LD_PRELOAD=$(pwd)/rhbz563103.so
-export LD_PRELOAD
-
 # This test fails because we build the ISO after encoding the checksum
 # of the ISO in the test itself.  Need to fix the test to work out the
 # checksum at runtime.
@@ -740,11 +729,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Nov 11 2010 Richard Jones <rjones@redhat.com> - 1:1.7.4-1
+* Thu Nov 11 2010 Richard Jones <rjones@redhat.com> - 1:1.7.4-2
 - New upstream development version 1.7.4.
 - ocaml-xml-light is no longer required.
 - Remove guestfs-actions.h and guestfs-structs.h.  Libguestfs now
   only exports a single <guestfs.h> header file.
+- Add patch to fix broken Perl test.
+- Remove workaround for RHBZ#563103.
 
 * Mon Nov  8 2010 Richard Jones <rjones@redhat.com> - 1:1.7.3-1
 - New upstream development version 1.7.3.