rpms/perl-Test-AutoBuild/devel perl-Test-AutoBuild-1.2.2-git-output.patch, NONE, 1.1 perl-Test-AutoBuild.spec, 1.8, 1.9

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/perl-Test-AutoBuild/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31665

Modified Files:
	perl-Test-AutoBuild.spec 
Added Files:
	perl-Test-AutoBuild-1.2.2-git-output.patch 
Log Message:
Fixed test case for change in GIT output

perl-Test-AutoBuild-1.2.2-git-output.patch:

--- NEW FILE perl-Test-AutoBuild-1.2.2-git-output.patch ---
diff -rup Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/Git.pm Test-AutoBuild-1.2.2.new/lib/Test/AutoBuild/Repository/Git.pm
--- Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/Git.pm	2007-12-09 21:23:35.000000000 -0500
+++ Test-AutoBuild-1.2.2.new/lib/Test/AutoBuild/Repository/Git.pm	2008-03-07 17:55:10.000000000 -0500
@@ -239,6 +239,7 @@ sub _get_changes {
 		    # ignore
 		}
 	    } elsif (defined $logs{$hash}->{description}) {
+                next if $line =~ /^\s*<unknown>\s*$/;
 		$line =~ s/(^\s*)|(\s*$)//g;
 		if ($logs{$hash}->{description} eq "") {
 		    $logs{$hash}->{description} .= $line;
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-Git.t Test-AutoBuild-1.2.2.new/t/110-Repository-Git.t
--- Test-AutoBuild-1.2.2/t/110-Repository-Git.t	2007-12-09 21:23:35.000000000 -0500
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-Git.t	2008-03-07 17:57:35.000000000 -0500
@@ -69,13 +69,13 @@ SKIP: {
 									     user => "Daniel Berrange <berrange\@t60wlan.home.berrange.com>",
 									     date => "1197239956",
 									     files => ["a"],
-									     description => "Change 1 on trunk\n<unknown>")}, 1);
+									     description => "Change 1 on trunk")}, 1);
 
   &checkout(3, "head", $head, 1197239967, "2\n", 1, { "3c4dfa7" => Test::AutoBuild::Change->new(number => "3c4dfa7",
 									     user => "Daniel Berrange <berrange\@t60wlan.home.berrange.com>",
 									     date => "1197239966",
 									     files => ["a"],
-									     description => "Change 2 on trunk\n<unknown>")}, 2);
+									     description => "Change 2 on trunk")}, 2);
 
 
   #&checkout("head", $head, 1109844423, "2\n", 0, { }, 3 );
@@ -85,12 +85,12 @@ SKIP: {
 									     user => "Daniel Berrange <berrange\@t60wlan.home.berrange.com>",
 									     date => "1197239986",
 									     files => ["a"],
-									     description => "Change 3 on branch\n<unknown>"),
+									     description => "Change 3 on branch"),
 					   "3870532" => Test::AutoBuild::Change->new(number => "3870532",
 									     user => "Daniel Berrange <berrange\@t60wlan.home.berrange.com>",
 									     date => "1197240006",
 									     files => ["a"],
-									     description => "Change 4 on trunk\n<unknown>"), }, 4 );
+									     description => "Change 4 on trunk"), }, 4 );
   &checkout(6, "branch", $branch, 1197240007, "3\n", 0, {}, 3);
 
   #&checkout("head", $head, 1109844447, "4\n", 0, { }, 7);
@@ -98,23 +98,23 @@ SKIP: {
 									     user => "Daniel Berrange <berrange\@t60wlan.home.berrange.com>",
 									       date => "1197240016",
 									       files => ["a"],
-									       description => "Change 5 on branch\n<unknown>") }, 5 );
+									       description => "Change 5 on branch") }, 5 );
 
   &checkout(8, "head", $head, 1197240027, "6\n", 1, { "10c317b" => Test::AutoBuild::Change->new(number => "10c317b",
 									     user => "Daniel Berrange <berrange\@t60wlan.home.berrange.com>",
 									     date => "1197240016",
 									     files => ["a"],
-									     description => "Change 5 on branch\n<unknown>"),
+									     description => "Change 5 on branch"),
 					   "f92574d"=> Test::AutoBuild::Change->new(number => "f92574d",
 									     user => "Daniel Berrange <berrange\@t60wlan.home.berrange.com>",
 									     date => "1197240016",
 									     files => [],
-									     description => "Merge branch 'wibble'\n<unknown>"),
+									     description => "Merge branch 'wibble'"),
 					   "0273df1"=> Test::AutoBuild::Change->new(number => "0273df1",
 									     user => "Daniel Berrange <berrange\@t60wlan.home.berrange.com>",
 									     date => "1197240026",
 									     files => ["a"],
-									     description => "Change 6 on trunk\n<unknown>") }, 6 );
+									     description => "Change 6 on trunk") }, 6 );
   &checkout(9, "branch", $branch, 1197240027, "5\n", 0, {}, 5);
 
 }


Index: perl-Test-AutoBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-AutoBuild/devel/perl-Test-AutoBuild.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Test-AutoBuild.spec	7 Mar 2008 02:17:27 -0000	1.8
+++ perl-Test-AutoBuild.spec	7 Mar 2008 23:19:39 -0000	1.9
@@ -12,11 +12,12 @@
 Summary: Framework for performing continuous, unattended, automated software builds
 Name: perl-%{appname}
 Version: 1.2.2
-Release: 2%{_extra_release}
+Release: 3%{_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: %{name}-%{version}-git-output.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
@@ -33,6 +34,8 @@
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Pod)
 BuildRequires: perl(Test::Pod::Coverage)
+BuildRequires: perl(YAML::Syck)
+BuildRequires: perl(Test::YAML::Meta::Version)
 BuildRequires: cvs >= 1.11
 BuildRequires: subversion >= 1.0.0
 BuildRequires: tla >= 1.1.0
@@ -235,6 +238,7 @@
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -423,6 +427,10 @@
 %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
 
 %changelog
+* Fri Mar 07 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.2-3.fc9
+- Fix parsing of GIT output
+- Added missing build requires for META.yml test case
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.2.2-2
 Rebuild for new perl