SPECS: apache-mod_perl.spec - bcond-remove internal Apache-Test

[baggins]

Author: baggins                      Date: Wed Jan 18 09:23:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond-remove internal Apache-Test

---- Files affected:
SPECS:
   apache-mod_perl.spec (1.119 -> 1.120) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_perl.spec
diff -u SPECS/apache-mod_perl.spec:1.119 SPECS/apache-mod_perl.spec:1.120
--- SPECS/apache-mod_perl.spec:1.119	Wed Jan 18 10:17:04 2006
+++ SPECS/apache-mod_perl.spec	Wed Jan 18 10:23:11 2006
@@ -2,6 +2,8 @@
 # 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_without	internal_test	# use internal Apache-Test
+#
 %include	/usr/lib/rpm/macros.perl
 %define	apxs	/usr/sbin/apxs
 %define	apache_test_version	1.27-2
@@ -40,7 +42,7 @@
 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
@@ -50,7 +52,7 @@
 # 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
@@ -205,6 +207,7 @@
 %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
@@ -212,6 +215,7 @@
 	exit 1
 fi
 rm -rf Apache-Test
+%endif
 
 %build
 %{__perl} Makefile.PL \
@@ -292,6 +296,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120  2006/01/18 09:23:11  baggins
+- bcond-remove internal Apache-Test
+
 Revision 1.119  2006/01/18 09:17:04  baggins
 - builder play
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_perl.spec?r1=1.119&r2=1.120&f=u