- rel 12

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

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index bc2bac005863be4cb7c9bef670944e845576e04b..ce95d5a4fe3dae591ef4727487f5a841b3fb94ba 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -3,7 +3,6 @@
 #
 # Conditional build:
 %bcond_without autodeps        # don't care about perl() deps resolving
-%bcond_with    internal_test   # use internal Apache-Test
 #
 %include       /usr/lib/rpm/macros.perl
 %define                apxs    /usr/sbin/apxs
@@ -31,7 +30,7 @@ Summary(uk):  
 Summary(zh_CN):        ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:          apache-mod_perl
 Version:       2.0.2
-Release:       10
+Release:       12
 Epoch:         1
 License:       Apache
 Group:         Networking/Daemons
@@ -45,7 +44,7 @@ BuildRequires:        apr-util-devel >= 1:1.0.0
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel
 BuildRequires: openldap-devel >= 2.3.0
-%{!?with_internal_test:BuildRequires:  perl-Apache-Test = %{apache_test_version}}
+BuildRequires: perl-Apache-Test >= 1:%{apache_test_version}
 %{?with_autodeps:BuildRequires:        perl-Data-Flow}
 BuildRequires: perl-devel >= 1:5.8.2
 BuildRequires: rpm-perlprov >= 3.0.3-16
@@ -199,8 +198,6 @@ Group:              Development/Libraries
 Requires:      apache-devel >= 2.0
 Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 Requires:      perl-mod_%{mod_name} = %{epoch}:%{version}-%{release}
-# not sure is this neccessary
-%{!?with_internal_test:Requires:       perl-Apache-Test = %{apache_test_version}}
 Obsoletes:     mod_perl
 Obsoletes:     mod_perl-common
 Conflicts:     perl-modules < 1:5.8.6-6
@@ -215,27 +212,25 @@ korzystaj
 
 %package -n perl-mod_%{mod_name}
 Summary:       Perl APIs for mod_perl
+Summary(pl):   Perlowe API dla mod_perla
 Group:         Development/Languages/Perl
 
 %description -n perl-mod_%{mod_name}
 Perl APIs for mod_perl.
 
 %description -n perl-mod_%{mod_name} -l pl
-Perlowe API dla mod_perl.
+Perlowe API dla mod_perla.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{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
-       : Need Apache::Test version $bundled installed in system. please fix.
+if [ "%apache_test_version" != "$bundled" ]; then
+       : "%%define apache_test_version to $bundled and retry."
        exit 1
 fi
 rm -rf Apache-Test
-%endif
 
 %build
 %{__perl} Makefile.PL \