rpms/perl-Sys-Virt-TCK/devel Sys-Virt-TCK-0.1.0-cleanup-skip.patch, NONE, 1.1 perl-Sys-Virt-TCK.spec, 1.2, 1.3

[Daniel P. Berrange]

Author: berrange

Update of /cvs/pkgs/rpms/perl-Sys-Virt-TCK/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9746

Modified Files:
	perl-Sys-Virt-TCK.spec 
Added Files:
	Sys-Virt-TCK-0.1.0-cleanup-skip.patch 
Log Message:
Fix missing dep. Fix sanitycheck cleanup. Remove broken test

Sys-Virt-TCK-0.1.0-cleanup-skip.patch:
 TCK.pm |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE Sys-Virt-TCK-0.1.0-cleanup-skip.patch ---
diff -rup Sys-Virt-TCK-0.1.0/lib/Sys/Virt/TCK.pm Sys-Virt-TCK-0.1.0.new/lib/Sys/Virt/TCK.pm
--- Sys-Virt-TCK-0.1.0/lib/Sys/Virt/TCK.pm	2009-07-22 18:33:55.000000000 +0100
+++ Sys-Virt-TCK-0.1.0.new/lib/Sys/Virt/TCK.pm	2009-08-05 17:22:15.000000000 +0100
@@ -57,7 +57,13 @@ sub setup {
 
     $self->reset if $self->{autoclean};
 
-    $self->sanity_check;
+    eval {
+	$self->sanity_check;
+    };
+    if ($@) {
+	$self->{conn} = undef;
+	die $@;
+    }
 
     return $self->{conn};
 }


Index: perl-Sys-Virt-TCK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Sys-Virt-TCK/devel/perl-Sys-Virt-TCK.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- perl-Sys-Virt-TCK.spec	26 Jul 2009 16:38:15 -0000	1.2
+++ perl-Sys-Virt-TCK.spec	5 Aug 2009 16:41:25 -0000	1.3
@@ -10,10 +10,11 @@
 Summary: Sys::Virt::TCK - libvirt Technology Compatibility Kit
 Name: perl-%{appname}
 Version: 0.1.0
-Release: 4%{dist}
+Release: 5%{dist}
 License: GPLv2 or Artistic
 Group: Development/Tools
 Source: http://libvirt.org/sources/tck/%{appname}-%{version}.tar.gz
+Patch1: %{appname}-%{version}-cleanup-skip.patch
 Url: http://libvirt.org/
 BuildRoot: %{_tmppath}/%{appname}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libvirt >= 0.6.2
@@ -42,6 +43,8 @@ BuildRequires: perl(XML::Writer)
 BuildRequires: perl(XML::XPath)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
+# RPM autoprovides mising this
+Requires: perl(Test::Exception)
 BuildArchitectures: noarch
 
 %description
@@ -51,7 +54,7 @@ technology.
 
 %prep
 %setup -q -n %{appname}-%{version}
-
+%patch1 -p1
 
 %build
 %{__perl} Build.PL installdirs=vendor
@@ -69,6 +72,9 @@ find $RPM_BUILD_ROOT -depth -type d -exe
 
 %__install -m 0755 -d $RPM_BUILD_ROOT%{_localstatedir}/cache/libvirt-tck
 
+# Requires newer libvirt perl binding
+rm -f $RPM_BUILD_ROOT/%{_datadir}/libvirt-tck/tests/storage/200-clone-vol-dir.t
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -91,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_localstatedir}/cache/libvirt-tck
 
 %changelog
+* Wed Aug  5 2009 Daniel P. Berrange <berrange at redhat.com> - 0.1.0-5
+- Add missing perl-Test-Exception dep
+- Skip cleanup if sanity check fails
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild