- reverse bcond

[packages/apache-mod_perl.git] / apache-mod_perl.spec

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 03e59b03e68d5f9beb72d3071cc9d319804a28a8..e15eb79290715862ff7a8ec21db168fd9639f487 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -1,9 +1,11 @@
 # TODO:
 # - separate perl-things from apache libs and configs (needed for some buildings)
 # - separate devel things from runtime things (apache-mod_perl-2.0.2-2 marks perl-ExtUtils-MakeMaker-6.25_08-1 (cap perl(ExtUtils::Install)))
+%bcond_with    internal_test   # use internal Apache-Test
+#
 %include       /usr/lib/rpm/macros.perl
 %define        apxs    /usr/sbin/apxs
-%define        apache_test_version     1.27-1.5
+%define        apache_test_version     1.27-2
 Summary:       A Perl interpreter for the Apache Web server
 Summary(cs):   Vestavìný interpret Perlu pro WWW server Apache
 Summary(da):   En indbygget Perl-fortolker for webtjeneren Apache
@@ -25,7 +27,7 @@ Summary(uk):  
 Summary(zh_CN):        ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:          apache-mod_perl
 Version:       2.0.2
-Release:       4.5
+Release:       5
 Epoch:         1
 License:       Apache
 Group:         Networking/Daemons
@@ -39,7 +41,7 @@ BuildRequires:        apr-util-devel >= 1:1.0.0
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel
 BuildRequires: openldap-devel >= 2.3.0
-BuildRequires: perl-Apache-Test = %{apache_test_version}
+%{!?internal_test:BuildRequires:       perl-Apache-Test = %{apache_test_version}}
 BuildRequires: perl-devel >= 1:5.8.2
 BuildRequires: rpm-perlprov >= 3.0.3-16
 %requires_eq_to        apache apache-devel
@@ -49,7 +51,7 @@ Provides:     apache(mod_perl)
 # What's this mod_perl_hooks for?
 Provides:      perl(mod_perl_hooks)
 # not sure is this neccessary
-Requires:      perl-Apache-Test = %{apache_test_version}
+%{!?internal_test:Requires:    perl-Apache-Test = %{apache_test_version}}
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
 Conflicts:     perl-modules < 1:5.8.6-6
@@ -204,6 +206,7 @@ building XS modules that use mod_perl.
 %setup -q -n mod_perl-%{version}
 %patch0 -p1
 
+if %{without internal_test}
 system=$(%{__perl} -MApache::Test -e 'print Apache::Test->VERSION')
 bundled=$(%{__perl} -IApache-Test/lib -MApache::Test -e 'print Apache::Test->VERSION')
 if [ "$system" != "$bundled" ]; then
@@ -211,6 +214,7 @@ if [ "$system" != "$bundled" ]; then
        exit 1
 fi
 rm -rf Apache-Test
+%endif
 
 %build
 %{__perl} Makefile.PL \