[perl-Test-AutoBuild/f15] Update to 1.2.4 release
Daniel P. Berrange
berrange at fedoraproject.org
Thu Sep 1 21:40:28 UTC 2011
commit 6313f98ae930e4aae569e5b48361b10735775abb
Author: Daniel P. Berrange <dan at berrange.com>
Date: Thu Sep 1 22:14:37 2011 +0100
Update to 1.2.4 release
perl-Test-AutoBuild.spec | 304 ++++++++++++++++++++++++++++++----------------
sources | 2 +-
2 files changed, 200 insertions(+), 106 deletions(-)
---
diff --git a/perl-Test-AutoBuild.spec b/perl-Test-AutoBuild.spec
index cf05426..d4e4e4c 100644
--- a/perl-Test-AutoBuild.spec
+++ b/perl-Test-AutoBuild.spec
@@ -1,11 +1,35 @@
+# Automatically generated by perl-Test-AutoBuild.spec.PL
%bcond_without fedora
%define appname Test-AutoBuild
%define with_selinux 0
+# Everything on by default
+%define with_bzr 1
+%define with_cvs 1
+%define with_darcs 1
+%define with_git 1
+%define with_mercurial 1
%define with_monotone 1
-%define with_tla 0
+%define with_perforce 1
+%define with_svk 1
+%define with_svn 1
+%define with_tla 1
+
+# Not available in any Fedora release
+%if %{?fedora}
%define with_perforce 0
+%endif
+
+# Not available since F15 onwards
+%if %{?fedora} >= 14
+%define with_tla 0
+%endif
+
+# Darcs won't work on arches which lack GHC
+%ifnarch %{?ghc_arches}
+%define with_darcs 0
+%endif
# Avoid empty debug file
%define debug_package %{nil}
@@ -18,23 +42,18 @@
Summary: Framework for performing continuous, unattended, automated software builds
Name: perl-%{appname}
-Version: 1.2.3
-Release: 4%{_extra_release}
+Version: 1.2.4
+Release: 1%{_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
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
-# off the darcs sub-RPM.
+# on some architecutures we need to use arch specific conditionals
+# to kill off the darcs sub-RPM.
#BuildArchitectures: noarch
-# We've disabled these sub-RPMs, so Obsolete them to make them
-# disappear on upgrade
-Obsoletes: perl-Test-AutoBuild-tla
-Obsoletes: perl-Test-AutoBuild-perforce
-
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: perl(BSD::Resource) >= 1.15
@@ -43,6 +62,7 @@ BuildRequires: perl(Log::Log4perl)
BuildRequires: perl(Template)
BuildRequires: perl(IO::Scalar)
BuildRequires: perl(Date::Manip)
+BuildRequires: perl(File::ReadBackwards)
BuildRequires: perl(Class::MethodMaker)
BuildRequires: perl(XML::Simple)
BuildRequires: perl(Test::More)
@@ -50,21 +70,34 @@ BuildRequires: perl(Test::Pod)
BuildRequires: perl(Test::Pod::Coverage)
BuildRequires: perl(YAML::Syck)
BuildRequires: perl(Test::YAML::Meta::Version)
+BuildRequires: perl(ExtUtils::MakeMaker)
+%if %{with_bzr}
+BuildRequires: bzr >= 0.91
+%endif
+%if %{with_cvs}
BuildRequires: cvs >= 1.11
-BuildRequires: subversion >= 1.0.0
-%if %{with_tla}
-BuildRequires: tla >= 1.1.0
%endif
-BuildRequires: mercurial >= 0.7
-BuildRequires: perl-SVK >= 1.0
-BuildRequires: git >= 1.5.0.0
-%ifarch %{ghc_arches}
+%if %{with_darcs}
BuildRequires: darcs >= 1.0.0
%endif
-BuildRequires: bzr >= 0.91
+%if %{with_git}
+BuildRequires: git >= 1.5.0.0
+%endif
+%if %{with_mercurial}
+BuildRequires: mercurial >= 0.7
+%endif
%if %{with_monotone}
BuildRequires: monotone >= 0.37
%endif
+%if %{with_svk}
+BuildRequires: perl-SVK >= 1.0
+%endif
+%if %{with_svn}
+BuildRequires: subversion >= 1.0.0
+%endif
+%if %{with_tla}
+BuildRequires: tla >= 1.1.0
+%endif
BuildRequires: fedora-usermgmt-devel
%if %{with_selinux}
BuildRequires: selinux-policy-devel
@@ -80,6 +113,8 @@ Requires: /usr/bin/createrepo
Requires: /usr/bin/genbasedir
# For Test::AutoBuild::Publisher::XSLTransform
Requires: /usr/bin/xsltproc
+# For Test::AutoBuild::Stage::RSyncStatus
+Requires: /usr/bin/rsync
# Automatic RPM perl deps script misses this
Requires: perl(Class::MethodMaker)
@@ -100,42 +135,50 @@ Requires: perl-%{appname} = %{version}-%{release}
Requires(post): policycoreutils
%endif
+%if %{with_bzr}
+%package bzr
+Summary: Bazaar source repository integration for autobuild engine
+Group: Development/Tools
+Url: http://autobuild.org/
+Requires: perl-%{appname} = %{version}-%{release}
+Requires: bzr >= 0.91
+%endif
+
+%if %{with_cvs}
%package cvs
Summary: CVS source repository integration for autobuild engine
Group: Development/Tools
Url: http://autobuild.org/
Requires: perl-%{appname} = %{version}-%{release}
Requires: cvs >= 1.11
+%endif
-%package mercurial
-Summary: Mercurial source repository integration for autobuild engine
+%if %{with_darcs}
+%package darcs
+Summary: Darcs source repository integration for autobuild engine
Group: Development/Tools
Url: http://autobuild.org/
Requires: perl-%{appname} = %{version}-%{release}
-Requires: mercurial >= 0.7
+Requires: darcs >= 1.0.0
+%endif
+%if %{with_git}
%package git
Summary: Git source repository integration for autobuild engine
Group: Development/Tools
Url: http://autobuild.org/
Requires: perl-%{appname} = %{version}-%{release}
Requires: git >= 1.5.0.0
-
-%ifarch %{ghc_arches}
-%package darcs
-Summary: Darcs source repository integration for autobuild engine
-Group: Development/Tools
-Url: http://autobuild.org/
-Requires: perl-%{appname} = %{version}-%{release}
-Requires: darcs >= 1.0.0
%endif
-%package bzr
-Summary: Bazaar source repository integration for autobuild engine
+%if %{with_mercurial}
+%package mercurial
+Summary: Mercurial source repository integration for autobuild engine
Group: Development/Tools
Url: http://autobuild.org/
Requires: perl-%{appname} = %{version}-%{release}
-Requires: bzr >= 0.91
+Requires: mercurial >= 0.7
+%endif
%if %{with_monotone}
%package monotone
@@ -146,38 +189,41 @@ Requires: perl-%{appname} = %{version}-%{release}
Requires: monotone >= 0.37
%endif
-%package subversion
-Summary: Subversion source repository integration for autobuild engine
-Group: Development/Tools
-Url: http://autobuild.org/
-Requires: perl-%{appname} = %{version}-%{release}
-Requires: subversion >= 1.0.0
-
-%if %{with_tla}
-%package tla
-Summary: GNU Arch source repository integration for autobuild engine
+%if %{with_perforce}
+%package perforce
+Summary: Perforce source repository integration for autobuild engine
Group: Development/Tools
Url: http://autobuild.org/
Requires: perl-%{appname} = %{version}-%{release}
-Requires: tla >= 1.1.0
+Requires: perforce
%endif
+%if %{with_svk}
%package svk
Summary: SVK source repository integration for autobuild engine
Group: Development/Tools
Url: http://autobuild.org/
Requires: perl-%{appname} = %{version}-%{release}
Requires: perl-SVK >= 1.0
+%endif
-%if %{with_perforce}
-%package perforce
-Summary: Perforce source repository integration for autobuild engine
+%if %{with_svn}
+%package subversion
+Summary: Subversion source repository integration for autobuild engine
Group: Development/Tools
Url: http://autobuild.org/
Requires: perl-%{appname} = %{version}-%{release}
-Requires: perforce
+Requires: subversion >= 1.0.0
%endif
+%if %{with_tla}
+%package tla
+Summary: GNU Arch source repository integration for autobuild engine
+Group: Development/Tools
+Url: http://autobuild.org/
+Requires: perl-%{appname} = %{version}-%{release}
+Requires: tla >= 1.1.0
+%endif
%description
Test-AutoBuild is a Perl framework for performing continuous, unattended,
@@ -191,42 +237,50 @@ This sub-package creates a 'builder' user account and the directory structure
in /var/lib/builder necessary for running a builder instance using the default
example configuration file.
+%if %{with_bzr}
+%description bzr
+Test-AutoBuild is a Perl framework for performing continuous, unattended,
+automated software builds.
+
+This sub-package provides the module for integrating with the Bazaar
+version control system
+%endif
+
+%if %{with_cvs}
%description cvs
Test-AutoBuild is a Perl framework for performing continuous, unattended,
automated software builds.
This sub-package provides the module for integrating with the CVS version
control system
+%endif
-%description mercurial
+%if %{with_darcs}
+%description darcs
Test-AutoBuild is a Perl framework for performing continuous, unattended,
automated software builds.
-This sub-package provides the module for integrating with the Mercurial
+This sub-package provides the module for integrating with the Darcs
version control system
+%endif
+%if %{with_git}
%description git
Test-AutoBuild is a Perl framework for performing continuous, unattended,
automated software builds.
This sub-package provides the module for integrating with the Git
version control system
-
-%ifarch %{ghc_arches}
-%description darcs
-Test-AutoBuild is a Perl framework for performing continuous, unattended,
-automated software builds.
%endif
-This sub-package provides the module for integrating with the Darcs
-version control system
-
-%description bzr
+%if %{with_mercurial}
+%description mercurial
Test-AutoBuild is a Perl framework for performing continuous, unattended,
automated software builds.
-This sub-package provides the module for integrating with the Bazaar
+This sub-package provides the module for integrating with the Mercurial
version control system
+%endif
%if %{with_monotone}
%description monotone
@@ -237,22 +291,6 @@ This sub-package provides the module for integrating with the Monotone
version control system
%endif
-%description subversion
-Test-AutoBuild is a Perl framework for performing continuous, unattended,
-automated software builds.
-
-This sub-package provides the module for integrating with the Subversion
-version control system
-
-%if %{with_tla}
-%description tla
-Test-AutoBuild is a Perl framework for performing continuous, unattended,
-automated software builds.
-
-This sub-package provides the module for integrating with the GNU Arch
-version control system
-%endif
-
%if %{with_perforce}
%description perforce
Test-AutoBuild is a Perl framework for performing continuous, unattended,
@@ -262,29 +300,75 @@ This sub-package provides the module for integrating with the Perforce
version control system.
%endif
+%if %{with_svk}
%description svk
Test-AutoBuild is a Perl framework for performing continuous, unattended,
automated software builds.
This sub-package provides the module for integrating with the SVK version
control system
+%endif
+%if %{with_svn}
+%description subversion
+Test-AutoBuild is a Perl framework for performing continuous, unattended,
+automated software builds.
+
+This sub-package provides the module for integrating with the Subversion
+version control system
+%endif
+%if %{with_tla}
+%description tla
+Test-AutoBuild is a Perl framework for performing continuous, unattended,
+automated software builds.
+
+This sub-package provides the module for integrating with the GNU Arch
+version control system
+%endif
%prep
%setup -q -n %{appname}-%{version}
+%if %{with_bzr} == 0
+rm -f lib/Test/AutoBuild/Repository/Bazaar.pm
+rm -f t/110-Repository-Bzr.t
+%endif
+%if %{with_cvs} == 0
+rm -f lib/Test/AutoBuild/Repository/CVS.pm
+rm -f t/110-Repository-CVS.t
+%endif
+%if %{with_darcs} == 0
+rm -f lib/Test/AutoBuild/Repository/Darcs.pm
+rm -f t/110-Repository-Darcs.t
+%endif
+%if %{with_git} == 0
+rm -f lib/Test/AutoBuild/Repository/Git.pm
+rm -f t/110-Repository-Git.t
+%endif
+%if %{with_mercurial} == 0
+rm -f lib/Test/AutoBuild/Repository/Mercurial.pm
+rm -f t/110-Repository-Mercurial.t
+%endif
%if %{with_monotone} == 0
rm -f lib/Test/AutoBuild/Repository/Monotone.pm
rm -f t/110-Repository-Monotone.t
%endif
-%if %{with_tla} == 0
-rm -f lib/Test/AutoBuild/Repository/GNUArch.pm
-rm -f t/110-Repository-GNUArch.t
-%endif
%if %{with_perforce} == 0
rm -f lib/Test/AutoBuild/Repository/Perforce.pm
rm -f t/110-Repository-Perforce.t
%endif
+%if %{with_svk} == 0
+rm -f lib/Test/AutoBuild/Repository/SVK.pm
+rm -f t/110-Repository-SVK.t
+%endif
+%if %{with_svn} == 0
+rm -f lib/Test/AutoBuild/Repository/Subversion.pm
+rm -f t/110-Repository-Subversion.t
+%endif
+%if %{with_tla} == 0
+rm -f lib/Test/AutoBuild/Repository/GNUArch.pm
+rm -f t/110-Repository-GNUArch.t
+%endif
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -316,13 +400,8 @@ echo "/1 :pserver:anonymous at cvs.gna.org:2401/cvs/testautobuild A" \
echo "%%_topdir %{_localstatedir}/lib/builder/package-root/rpm" \
>> $RPM_BUILD_ROOT%{_localstatedir}/lib/builder/.rpmmacros
-%ifnarch %{ghc_arches}
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/Test/AutoBuild/Repository/Darcs.pm
-%endif
-
-
%check
-TZ=UTC %__make test
+%__make test
%clean
%__rm -rf $RPM_BUILD_ROOT
@@ -418,32 +497,40 @@ fi
%{_datadir}/selinux/packages/auto-build/auto-build.pp
%endif
+%if %{with_bzr}
+%files bzr
+%defattr(-,root,root)
+%doc README
+%{perl_vendorlib}/Test/AutoBuild/Repository/Bazaar.pm
+%endif
+
+%if %{with_cvs}
%files cvs
%defattr(-,root,root)
%doc README
%{perl_vendorlib}/Test/AutoBuild/Repository/CVS.pm
+%endif
-%files mercurial
+%if %{with_darcs}
+%files darcs
%defattr(-,root,root)
%doc README
-%{perl_vendorlib}/Test/AutoBuild/Repository/Mercurial.pm
+%{perl_vendorlib}/Test/AutoBuild/Repository/Darcs.pm
+%endif
+%if %{with_git}
%files git
%defattr(-,root,root)
%doc README
%{perl_vendorlib}/Test/AutoBuild/Repository/Git.pm
-
-%ifarch %{ghc_arches}
-%files darcs
-%defattr(-,root,root)
-%doc README
-%{perl_vendorlib}/Test/AutoBuild/Repository/Darcs.pm
%endif
-%files bzr
+%if %{with_mercurial}
+%files mercurial
%defattr(-,root,root)
%doc README
-%{perl_vendorlib}/Test/AutoBuild/Repository/Bazaar.pm
+%{perl_vendorlib}/Test/AutoBuild/Repository/Mercurial.pm
+%endif
%if %{with_monotone}
%files monotone
@@ -452,28 +539,32 @@ fi
%{perl_vendorlib}/Test/AutoBuild/Repository/Monotone.pm
%endif
-%files subversion
+%if %{with_perforce}
+%files perforce
%defattr(-,root,root)
%doc README
-%{perl_vendorlib}/Test/AutoBuild/Repository/Subversion.pm
+%{perl_vendorlib}/Test/AutoBuild/Repository/Perforce.pm
+%endif
-%if %{with_tla}
-%files tla
+%if %{with_svk}
+%files svk
%defattr(-,root,root)
%doc README
-%{perl_vendorlib}/Test/AutoBuild/Repository/GNUArch.pm
+%{perl_vendorlib}/Test/AutoBuild/Repository/SVK.pm
%endif
-%files svk
+%if %{with_svn}
+%files subversion
%defattr(-,root,root)
%doc README
-%{perl_vendorlib}/Test/AutoBuild/Repository/SVK.pm
+%{perl_vendorlib}/Test/AutoBuild/Repository/Subversion.pm
+%endif
-%if %{with_perforce}
-%files perforce
+%if %{with_tla}
+%files tla
%defattr(-,root,root)
%doc README
-%{perl_vendorlib}/Test/AutoBuild/Repository/Perforce.pm
+%{perl_vendorlib}/Test/AutoBuild/Repository/GNUArch.pm
%endif
%files account
@@ -487,6 +578,9 @@ fi
%config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
%changelog
+* Thu Sep 1 2011 Daniel P. Berrange <berrange at redhat.com> - 1.2.4-1
+- Update to 1.2.4 release
+
* Thu Aug 25 2011 Dan Horák <dan[at]danny.cz> - 1.2.3-4
- some tests expect UTC timezone
diff --git a/sources b/sources
index 95f07f9..f98db6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fa14d6392bec3c6e82858d193ca3bbf Test-AutoBuild-1.2.3.tar.gz
+b91270dc39afa4ea8314ec02be8b6a6f Test-AutoBuild-1.2.4.tar.gz
More information about the scm-commits
mailing list