[perl-Plack] Add %bcond_with apache to work around building failures in koji.

corsepiu corsepiu at fedoraproject.org
Fri Oct 14 02:27:45 UTC 2011


commit b3439ba96f52bad721ef9ab1f06076aeec129f8c
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Fri Oct 14 04:27:32 2011 +0200

    Add %bcond_with apache to work around building failures in koji.

 perl-Plack.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/perl-Plack.spec b/perl-Plack.spec
index 1c71a36..1bba80f 100644
--- a/perl-Plack.spec
+++ b/perl-Plack.spec
@@ -1,6 +1,6 @@
 Name:           perl-Plack
 Version:        0.9984
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -8,6 +8,11 @@ URL:            http://search.cpan.org/dist/Plack/
 Source0:        http://www.cpan.org/authors/id/M/MI/MIYAGAWA/Plack-%{version}.tar.gz
 BuildArch:      noarch
 
+# Building with apache2 tests enabled works in local mocks, 
+# but fails in Fedora's koji.
+# Default to not testing apache2.
+%bcond_with apache
+
 BuildRequires:  perl(Devel::StackTrace) >= 1.23
 BuildRequires:  perl(Devel::StackTrace::AsHTML) >= 0.11
 # Optional, not yet in Fedora: BuildRequires:  perl(Devel::StackTrace::WithLexicals) >= 0.8
@@ -85,7 +90,7 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} $RPM_BUILD_ROOT/*
 
 %check
-make test TEST_APACHE2=1 TEST_FCGI_CLIENT=1
+make test %{?_with_apache:TEST_APACHE2=1 TEST_FCGI_CLIENT=1}
 
 %files
 %defattr(-,root,root,-)
@@ -105,6 +110,9 @@ make test TEST_APACHE2=1 TEST_FCGI_CLIENT=1
 %{_mandir}/man3/*
 
 %changelog
+* Thu Oct 14 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.9984-2
+- Add %%bcond_with apache to work around building failures in koji.
+
 * Thu Oct 13 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.9984-1
 - Upstream update.
 


More information about the scm-commits mailing list