From 78f7ead59948ad4d9d1c0d0d1ab94d13832d424d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 18 Jan 2006 09:23:11 +0000 Subject: [PATCH] - bcond-remove internal Apache-Test Changed files: apache-mod_perl.spec -> 1.120 --- apache-mod_perl.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec index bb5754b..16a8f9f 100644 --- a/apache-mod_perl.spec +++ b/apache-mod_perl.spec @@ -1,6 +1,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 @@ -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 \ -- 2.44.0