rpms/perl-Test-AutoBuild/devel perl-Test-AutoBuild-1.2.2-cvs-sticky.patch, NONE, 1.1 perl-Test-AutoBuild-1.2.2-mtn-migrate.patch, NONE, 1.1 perl-Test-AutoBuild.spec, 1.10, 1.11

[Daniel P. Berrange]

Author: berrange

Update of /cvs/pkgs/rpms/perl-Test-AutoBuild/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5697

Modified Files:
	perl-Test-AutoBuild.spec 
Added Files:
	perl-Test-AutoBuild-1.2.2-cvs-sticky.patch 
	perl-Test-AutoBuild-1.2.2-mtn-migrate.patch 
Log Message:
Fix bugs in CVS and Monotone test suites. Make package arch dependant

perl-Test-AutoBuild-1.2.2-cvs-sticky.patch:

--- NEW FILE perl-Test-AutoBuild-1.2.2-cvs-sticky.patch ---
diff -rup Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/CVS.pm Test-AutoBuild-1.2.2-new/lib/Test/AutoBuild/Repository/CVS.pm
--- Test-AutoBuild-1.2.2/lib/Test/AutoBuild/Repository/CVS.pm	2007-12-08 15:10:26.000000000 -0500
+++ Test-AutoBuild-1.2.2-new/lib/Test/AutoBuild/Repository/CVS.pm	2008-09-23 05:13:32.000000000 -0400
@@ -76,7 +76,7 @@ sub export {
 
     my $cmd = -e $dst ?
 	($branch ?
-	 ['cvs', '-q', 'update', '-D', $date, '-r', $branch, '-APdC'] :
+	 ['cvs', '-q', 'update', '-D', $date, '-r', $branch, '-PdC'] :
 	 ['cvs', '-q', 'update', '-D', $date, '-APdC']) :
 	 ($branch ?
 	  ['cvs', '-q', 'checkout', '-D', $date, '-d', $dst, '-r', $branch, '-P', $src] :

perl-Test-AutoBuild-1.2.2-mtn-migrate.patch:

--- NEW FILE perl-Test-AutoBuild-1.2.2-mtn-migrate.patch ---
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	2007-12-11 22:33:00.000000000 -0500
+++ Test-AutoBuild-1.2.2-new/t/110-Repository-Monotone.t	2008-09-23 05:33:18.000000000 -0400
@@ -55,6 +55,8 @@ SKIP: {
 
   system "cd $build_repos && (gunzip -c $archive | tar xf -)";
 
+  system "cd $build_repos && mtn db migrate -d main.db";
+
   my $head = "main.db:trunk";
   my $branch = "main.db:wibble";
 


Index: perl-Test-AutoBuild.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl-Test-AutoBuild/devel/perl-Test-AutoBuild.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Test-AutoBuild.spec	18 Sep 2008 00:06:54 -0000	1.10
+++ perl-Test-AutoBuild.spec	23 Sep 2008 10:39:07 -0000	1.11
@@ -12,14 +12,19 @@
 Summary: Framework for performing continuous, unattended, automated software builds
 Name: perl-%{appname}
 Version: 1.2.2
-Release: 4%{_extra_release}
+Release: 5%{_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
+Patch2: %{name}-%{version}-cvs-sticky.patch
+Patch3: %{name}-%{version}-mtn-migrate.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
+# Technically this is a noarch package, but due to lack of ghc
+# on ppc/sparc we need to use arch specific conditionals to kill
+# off the darcs sub-RPM.
+#BuildArchitectures: noarch
 
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -245,6 +250,8 @@
 %prep
 %setup -q -n %{appname}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -275,6 +282,11 @@
 echo "%%_topdir %{_localstatedir}/lib/builder/package-root/rpm" \
   >> $RPM_BUILD_ROOT%{_localstatedir}/lib/builder/.rpmmacros
 
+%ifarch alpha ppc64
+rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Test/AutoBuild/Repository/Darcs.pm
+%endif
+
+
 %check
 %__make test
 
@@ -435,6 +447,11 @@
 %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
 
 %changelog
+* Tue Sep 23 2008 Daniel P. Berrange <berrange at redhat.com> - 1.2.2-5.fc10
+- Don't use -A to clear sticky tag when specifying a branch
+- Perform 'mtn db migrate' when running monotone test suite
+- Drop noarch until ghc comes to ppc/alpha
+
 * Thu Sep 18 2008 Jens Petersen <petersen at redhat.com> - 1.2.2-4.fc10
 - exclude darcs subpackage on ppc64 and alpha where there is no ghc currently