[perl-Test-AutoBuild] Disable GNU Arch & Perforce since they are not in Fedora

Daniel P. Berrange berrange at fedoraproject.org
Thu Aug 4 14:31:14 UTC 2011


commit f596217dd0e1dbac79353651f95593784d953e0e
Author: Daniel P. Berrange <berrange at redhat.com>
Date:   Thu Aug 4 15:30:56 2011 +0100

    Disable GNU Arch & Perforce since they are not in Fedora

 perl-Test-AutoBuild.spec |   47 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 11 deletions(-)
---
diff --git a/perl-Test-AutoBuild.spec b/perl-Test-AutoBuild.spec
index c8ac764..272f127 100644
--- a/perl-Test-AutoBuild.spec
+++ b/perl-Test-AutoBuild.spec
@@ -3,6 +3,10 @@
 %define appname Test-AutoBuild
 %define with_selinux 0
 
+%define with_monotone 0
+%define with_tla 0
+%define with_perforce 0
+
 # Avoid empty debug file
 %define debug_package %{nil}
 
@@ -15,7 +19,7 @@
 Summary: Framework for performing continuous, unattended, automated software builds
 Name: perl-%{appname}
 Version: 1.2.2
-Release: 15%{_extra_release}
+Release: 16%{_extra_release}
 License: GPLv2+
 Group: Development/Tools
 Url: http://autobuild.org/
@@ -47,7 +51,9 @@ BuildRequires: perl(YAML::Syck)
 BuildRequires: perl(Test::YAML::Meta::Version)
 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
@@ -55,7 +61,7 @@ BuildRequires: git >= 1.5.0.0
 BuildRequires: darcs >= 1.0.0
 %endif
 BuildRequires: bzr >= 0.91
-%if 0%{?with_monotone}
+%if %{with_monotone}
 BuildRequires: monotone >= 0.37
 %endif
 BuildRequires:  fedora-usermgmt-devel
@@ -130,7 +136,7 @@ Url: http://autobuild.org/
 Requires: perl-%{appname} = %{version}-%{release}
 Requires: bzr >= 0.91
 
-%if 0%{?with_monotone}
+%if %{with_monotone}
 %package monotone
 Summary: Monotone source repository integration for autobuild engine
 Group: Development/Tools
@@ -146,12 +152,14 @@ 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
 Group: Development/Tools
 Url: http://autobuild.org/
 Requires: perl-%{appname} = %{version}-%{release}
 Requires: tla >= 1.1.0
+%endif
 
 %package svk
 Summary: SVK source repository integration for autobuild engine
@@ -160,14 +168,14 @@ Url: http://autobuild.org/
 Requires: perl-%{appname} = %{version}-%{release}
 Requires: perl-SVK >= 1.0
 
+%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}
-# No RPMs of Perforce so we can't add a formal dep :-(
-# User will just have to download p4 binary direct from perforce.com
-#Requires: perforce
+Requires: perforce
+%endif
 
 
 %description
@@ -219,7 +227,7 @@ automated software builds.
 This sub-package provides the module for integrating with the Bazaar
 version control system
 
-%if 0%{?with_monotone}
+%if %{with_monotone}
 %description monotone
 Test-AutoBuild is a Perl framework for performing continuous, unattended,
 automated software builds.
@@ -235,21 +243,23 @@ 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,
 automated software builds.
 
 This sub-package provides the module for integrating with the Perforce
 version control system.
-
-NB. this package requires that the 'p4' binary is provided in $PATH.
+%endif
 
 %description svk
 Test-AutoBuild is a Perl framework for performing continuous, unattended,
@@ -266,10 +276,18 @@ control system
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%if 0%{?with_monotone} == 0
+%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
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -429,7 +447,7 @@ fi
 %doc README
 %{perl_vendorlib}/Test/AutoBuild/Repository/Bazaar.pm
 
-%if 0%{?with_monotone}
+%if %{with_monotone}
 %files monotone
 %defattr(-,root,root)
 %doc README
@@ -441,20 +459,24 @@ fi
 %doc README
 %{perl_vendorlib}/Test/AutoBuild/Repository/Subversion.pm
 
+%if %{with_tla}
 %files tla
 %defattr(-,root,root)
 %doc README
 %{perl_vendorlib}/Test/AutoBuild/Repository/GNUArch.pm
+%endif
 
 %files svk
 %defattr(-,root,root)
 %doc README
 %{perl_vendorlib}/Test/AutoBuild/Repository/SVK.pm
 
+%if %{with_perforce}
 %files perforce
 %defattr(-,root,root)
 %doc README
 %{perl_vendorlib}/Test/AutoBuild/Repository/Perforce.pm
+%endif
 
 %files account
 %defattr(-,root,root)
@@ -467,6 +489,9 @@ fi
 %config(noreplace) %attr(-,builder,builder) %{_localstatedir}/lib/builder/.cvspass
 
 %changelog
+* Thu Aug  4 2011 Daniel P. Berrange <berrange at redhat.com> - 1.2.2-16
+- Disable GNU Arch & Perforce since they are not in Fedora
+
 * Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 1.2.2-15
 - Perl mass rebuild
 


More information about the scm-commits mailing list