diff --git a/0001-perl-Ignore-debug-functions-in-Test-Pod-Coverage.patch b/0001-perl-Ignore-debug-functions-in-Test-Pod-Coverage.patch deleted file mode 100644 index 2802d50..0000000 --- a/0001-perl-Ignore-debug-functions-in-Test-Pod-Coverage.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3431f397d34740fcd3a2d6f94d03af6e5f8f1a36 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -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 - diff --git a/libguestfs.spec b/libguestfs.spec index ed255d2..ec92daa 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.7.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -52,9 +52,6 @@ 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 @@ -415,7 +412,6 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 -%patch1 -p1 mkdir -p daemon/m4 @@ -723,9 +719,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Nov 13 2010 Richard Jones - 1:1.7.5-1 +* Sat Nov 13 2010 Richard Jones - 1:1.7.5-2 - New upstream development version 1.7.5. - Remove hand-installation of Ruby bindings. +- Remove upstream patch. * Thu Nov 11 2010 Richard Jones - 1:1.7.4-2 - New upstream development version 1.7.4.