rpms/perl-Test-AutoBuild/F-11 perl-Test-AutoBuild-1.2.2-bzr-fixes.patch, NONE, 1.1 perl-Test-AutoBuild.spec, 1.13, 1.14

Wed Jul 22 20:04:08 UTC 2009

Author: berrange

Update of /cvs/extras/rpms/perl-Test-AutoBuild/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23577

Modified Files:
	perl-Test-AutoBuild.spec 
Added Files:
	perl-Test-AutoBuild-1.2.2-bzr-fixes.patch 
Log Message:
- Fix BZR repository tests (rhbz #511594)
- Add missing perl(Class::MethodMaker) dep (rhbz #432714)


perl-Test-AutoBuild-1.2.2-bzr-fixes.patch:
 lib/Test/AutoBuild/Repository/Bazaar.pm |    2 +-
 t/110-Repository-Bzr.t                  |    1 +
 t/110-Repository-CVS.t                  |    1 +
 t/110-Repository-Darcs.t                |    1 +
 t/110-Repository-GNUArch.t              |    1 +
 t/110-Repository-Git.t                  |    1 +
 t/110-Repository-Mercurial.t            |    1 +
 t/110-Repository-Monotone.t             |    1 +
 t/110-Repository-Perforce.t             |    1 +
 t/110-Repository-SVN.t                  |    1 +
 10 files changed, 10 insertions(+), 1 deletion(-)

--- NEW FILE perl-Test-AutoBuild-1.2.2-bzr-fixes.patch ---
diff -rup Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/Bazaar.pm Test-AutoBuild-1.2.2.new/lib/Test/AutoBuild/Repository/Bazaar.pm
--- Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/Bazaar.pm	2007-12-11 05:07:23.000000000 +0000
+++ Test-AutoBuild-1.2.2.new/lib/Test/AutoBuild/Repository/Bazaar.pm	2009-07-22 20:36:04.000000000 +0100
@@ -191,7 +191,7 @@ sub _get_changes {
     foreach my $line (@lines) {
 	next if $line =~ /^\s*$/;
 	#$log->debug("[$line]");
-	if ($line =~ m,^revno:\s*(\d+(?:\.\d+)*)\s*$,i) {
+	if ($line =~ m,^revno:\s*(\d+(?:\.\d+)*)\s*(\[merge\])?\s*$,i) {
 	    $number = $1;
 	    $log->debug("Version number " . $number );
 	    $logs{$number} = { number => $number };
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-Bzr.t Test-AutoBuild-1.2.2.new/t/110-Repository-Bzr.t
--- Test-AutoBuild-1.2.2/t/110-Repository-Bzr.t	2007-12-11 05:07:23.000000000 +0000
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-Bzr.t	2009-07-22 20:29:38.000000000 +0100
@@ -23,6 +23,7 @@ my $build_home = catfile($here, "t", "bu
 my $archive = catfile($here, "t", "110-Repository-Bzr.tar.gz");
 
 END {
+  chdir $here;
   unless ($ENV{DEBUG_TESTS}) {
     rmtree ($build_repos);
     rmtree ($build_home);
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-CVS.t Test-AutoBuild-1.2.2.new/t/110-Repository-CVS.t
--- Test-AutoBuild-1.2.2/t/110-Repository-CVS.t	2007-12-08 22:40:35.000000000 +0000
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-CVS.t	2009-07-22 20:29:34.000000000 +0100
@@ -23,6 +23,7 @@ my $build_home = catfile($here, "t", "bu
 my $archive = catfile($here, "t", "110-Repository-CVS.tar.gz");
 
 END {
+  chdir $here;
   unless ($ENV{DEBUG_TESTS}) {
     rmtree ($build_repos);
     rmtree ($build_home);
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-Darcs.t Test-AutoBuild-1.2.2.new/t/110-Repository-Darcs.t
--- Test-AutoBuild-1.2.2/t/110-Repository-Darcs.t	2007-12-10 04:45:18.000000000 +0000
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-Darcs.t	2009-07-22 20:29:31.000000000 +0100
@@ -23,6 +23,7 @@ my $build_home = catfile($here, "t", "bu
 my $archive = catfile($here, "t", "110-Repository-Darcs.tar.gz");
 
 END {
+  chdir $here;
   unless ($ENV{DEBUG_TESTS}) {
     rmtree ($build_repos);
     rmtree ($build_home);
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	2009-07-22 20:37:39.000000000 +0100
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-Git.t	2009-07-22 20:29:25.000000000 +0100
@@ -23,6 +23,7 @@ my $build_home = catfile($here, "t", "bu
 my $archive = catfile($here, "t", "110-Repository-Git.tar.gz");
 
 END {
+  chdir $here;
   unless ($ENV{DEBUG_TESTS}) {
     rmtree ($build_repos);
     rmtree ($build_home);
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-GNUArch.t Test-AutoBuild-1.2.2.new/t/110-Repository-GNUArch.t
--- Test-AutoBuild-1.2.2/t/110-Repository-GNUArch.t	2007-12-08 22:40:35.000000000 +0000
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-GNUArch.t	2009-07-22 20:29:22.000000000 +0100
@@ -24,6 +24,7 @@ my $build_home = catfile($here, "t", "bu
 my $archive = catfile($here, "t", "110-Repository-GNUArch.tar.gz");
 
 END {
+  chdir $here;
   rmtree ($build_repos);
   rmtree ($build_home);
 }
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-Mercurial.t Test-AutoBuild-1.2.2.new/t/110-Repository-Mercurial.t
--- Test-AutoBuild-1.2.2/t/110-Repository-Mercurial.t	2007-12-08 22:40:35.000000000 +0000
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-Mercurial.t	2009-07-22 20:29:18.000000000 +0100
@@ -23,6 +23,7 @@ my $build_home = catfile($here, "t", "bu
 my $archive = catfile($here, "t", "110-Repository-Mercurial.tar.gz");
 
 END {
+  chdir $here;
   unless ($ENV{DEBUG_TESTS}) {
     rmtree ($build_repos);
     rmtree ($build_home);
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-Monotone.t Test-AutoBuild-1.2.2.new/t/110-Repository-Monotone.t
--- Test-AutoBuild-1.2.2/t/110-Repository-Monotone.t	2009-07-22 20:37:39.000000000 +0100
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-Monotone.t	2009-07-22 20:29:15.000000000 +0100
@@ -23,6 +23,7 @@ my $build_home = catfile($here, "t", "bu
 my $archive = catfile($here, "t", "110-Repository-Monotone.tar.gz");
 
 END {
+  chdir $here;
   unless ($ENV{DEBUG_TESTS}) {
     rmtree ($build_repos);
     rmtree ($build_home);
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-Perforce.t Test-AutoBuild-1.2.2.new/t/110-Repository-Perforce.t
--- Test-AutoBuild-1.2.2/t/110-Repository-Perforce.t	2007-12-08 22:40:35.000000000 +0000
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-Perforce.t	2009-07-22 20:33:35.000000000 +0100
@@ -26,6 +26,7 @@ my $archive = catfile($here, "t", "110-R
 my $pid;
 
 END {
+  chdir $here;
   if (defined $pid) {
     my $kid = waitpid $pid, WNOHANG;
     if ($kid != $pid) {
diff -rup Test-AutoBuild-1.2.2/t/110-Repository-SVN.t Test-AutoBuild-1.2.2.new/t/110-Repository-SVN.t
--- Test-AutoBuild-1.2.2/t/110-Repository-SVN.t	2007-12-08 22:40:35.000000000 +0000
+++ Test-AutoBuild-1.2.2.new/t/110-Repository-SVN.t	2009-07-22 20:29:02.000000000 +0100
@@ -23,6 +23,7 @@ my $build_home = catfile($here, "t", "bu
 my $archive = catfile($here, "t", "110-Repository-SVN.gz");
 
 END {
+  chdir $here;
   rmtree ($build_repos);
   rmtree ($build_home);
 }


Index: perl-Test-AutoBuild.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-AutoBuild/F-11/perl-Test-AutoBuild.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- perl-Test-AutoBuild.spec	27 Feb 2009 02:13:37 -0000	1.13
+++ perl-Test-AutoBuild.spec	22 Jul 2009 20:03:37 -0000	1.14
@@ -15,7 +15,7 @@
 Summary: Framework for performing continuous, unattended, automated software builds
 Name: perl-%{appname}
 Version: 1.2.2
-Release: 7%{_extra_release}
+Release: 8%{_extra_release}
 License: GPLv2+
 Group: Development/Tools
 Url: http://autobuild.org/
@@ -23,6 +23,7 @@ Source: http://www.cpan.org/authors/id/D
 Patch1: %{name}-%{version}-git-output.patch
 Patch2: %{name}-%{version}-cvs-sticky.patch
 Patch3: %{name}-%{version}-mtn-migrate.patch
+Patch4: %{name}-%{version}-bzr-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Technically this is a noarch package, but due to lack of ghc
 # on ppc/sparc we need to use arch specific conditionals to kill
@@ -71,6 +72,9 @@ Requires: /usr/bin/genbasedir
 # For Test::AutoBuild::Publisher::XSLTransform
 Requires: /usr/bin/xsltproc
 
+# Automatic RPM perl deps script misses this
+Requires: perl(Class::MethodMaker)
+
 %if %{with_selinux}
 Requires(post): policycoreutils
 Requires(postun): policycoreutils
@@ -255,6 +259,7 @@ control system
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -450,6 +455,10 @@ fi
 %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
 
 %changelog
+* Wed Jul 22 2009 Daniel P. Berrange <berrange at redhat.com> - 1.2.2-8.fc11
+- Fix BZR repository tests (rhbz #511594)
+- Add missing perl(Class::MethodMaker) dep (rhbz #432714)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


