[perl-Test-AutoBuild] Update test suite for renamed YAML module

[Daniel P. Berrange]

commit 3701f61205045d1b5d495609caf44ce5f08be8c1
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Fri Mar 9 13:27:05 2012 +0000

    Update test suite for renamed YAML module

 Test-AutoBuild-1.2.4-yaml.patch |   22 ++++++++++++++++++++++
 perl-Test-AutoBuild.spec        |   16 ++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)
---
diff --git a/Test-AutoBuild-1.2.4-yaml.patch b/Test-AutoBuild-1.2.4-yaml.patch
new file mode 100644
index 0000000..e2a6858
--- /dev/null
+++ b/Test-AutoBuild-1.2.4-yaml.patch
@@ -0,0 +1,22 @@
+diff -rup Test-AutoBuild-1.2.4.orig/t/008-meta.t Test-AutoBuild-1.2.4.new/t/008-meta.t
+--- Test-AutoBuild-1.2.4.orig/t/008-meta.t	2011-09-01 21:49:57.000000000 +0100
++++ Test-AutoBuild-1.2.4.new/t/008-meta.t	2012-03-09 13:07:55.949281028 +0000
+@@ -2,14 +2,14 @@
+ 
+ use Test::More tests => 1;
+ SKIP: {
+-  eval "use Test::YAML::Meta::Version; use YAML::Syck qw(LoadFile)";
+-  skip "Test::YAML::Meta::Version and YAML::Syck required for testing META.yml", 1 if $@;
++  eval "use Test::CPAN::Meta::YAML::Version; use YAML::Syck qw(LoadFile)";
++  skip "Test::CPAN::Meta::YAML::Version and YAML::Syck required for testing META.yml", 1 if $@;
+ 
+ my %data = (
+   yaml => LoadFile("META.yml"),
+ );
+ 
+-my $spec = Test::YAML::Meta::Version->new(%data);
++my $spec = Test::CPAN::Meta::YAML::Version->new(%data);
+ 
+ ok (!$spec->parse());
+ 
+Only in Test-AutoBuild-1.2.4.new/t: 008-meta.t~
diff --git a/perl-Test-AutoBuild.spec b/perl-Test-AutoBuild.spec
index b64fccd..4e7ae5b 100644
--- a/perl-Test-AutoBuild.spec
+++ b/perl-Test-AutoBuild.spec
@@ -34,20 +34,15 @@
 # Avoid empty debug file
 %define debug_package %{nil}
 
-# This macro is used for the continuous automated builds. It just
-# allows an extra fragment based on the timestamp to be appended
-# to the release. This distinguishes automated builds, from formal
-# Fedora RPM builds
-%define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}}
-
 Summary: Framework for performing continuous, unattended, automated software builds
 Name: perl-%{appname}
 Version: 1.2.4
-Release: 3%{_extra_release}
+Release: 4%{?dist}%{?extra_release}
 License: GPLv2+
 Group: Development/Tools
 Url: http://autobuild.org/
 Source: http://www.cpan.org/authors/id/D/DA/DANBERR/%{appname}-%{version}.tar.gz
+Patch1: %{appname}-%{version}-yaml.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Technically this is a noarch package, but due to lack of ghc
 # on some architecutures we need to use arch specific conditionals
@@ -69,7 +64,7 @@ BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
 BuildRequires: perl(YAML::Syck)
-BuildRequires: perl(Test::YAML::Meta::Version)
+BuildRequires: perl(Test::CPAN::Meta::YAML::Version)
 BuildRequires: perl(ExtUtils::MakeMaker)
 %if %{with_bzr}
 BuildRequires: bzr >= 0.91
@@ -327,6 +322,8 @@ version control system
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
+
 %if %{with_bzr} == 0
 rm -f lib/Test/AutoBuild/Repository/Bazaar.pm
 rm -f t/110-Repository-Bzr.t
@@ -576,6 +573,9 @@ fi
 %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
 
 %changelog
+* Fri Mar  9 2012 Daniel P. Berrange <berrange at redhat.com> - 1.2.4-4
+- Update test suite for renamed YAML module
+
 * Wed Mar  7 2012 Daniel P. Berrange <berrange at redhat.com> - 1.2.4-3
 - Remove obsolete dep on yum-arch