- version 2.03 rc1

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

diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec
index 20ff3380048e1d311305c3067fd8d0bd81e857c0..ae1903d9489d195a061e36a67b6221b12e6f2bf8 100644 (file)
--- a/apache-mod_perl.spec
+++ b/apache-mod_perl.spec
@@ -3,13 +3,12 @@
 #
 # 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
 %define                mod_name        perl
 # NB! leave this without *release*
-%define        apache_test_version     1.27
+%define        apache_test_version     1.29
 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
@@ -30,13 +29,15 @@ Summary(sv):        En inbyggd Perl-interpretator f
 Summary(uk):   íÏÄÕÌØ ×ÂÕÄÏ×Õ×ÁÎÎÑ ¦ÎÔÅÒÐÒÅÔÁÔÏÒÁ Perl × ÓÅÒ×ÅÒ Apache
 Summary(zh_CN):        ÓÃÓÚ Apache web ·þÎñ³ÌÐòµÄ Perl ½âÊͳÌÐò¡£
 Name:          apache-mod_perl
-Version:       2.0.2
-Release:       10
+%define        _rc     -rc1
+Version:       2.0.3
+Release:       0.%(echo %{_rc} | sed -e s/-//).1
 Epoch:         1
 License:       Apache
 Group:         Networking/Daemons
-Source0:       http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
-# Source0-md5: ad0a509fd34e3b8452887d80a1d45dea
+#Source0:      http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
+Source0:       http://people.apache.org/~pgollucci/mp2/mod_perl-%{version}%{_rc}.tar.gz
+# Source0-md5: 794dfb58f4219c76f600e8153d5cc347
 Source1:       %{name}.conf
 Patch0:                %{name}-Makefile_PL.patch
 URL:           http://perl.apache.org/
@@ -45,7 +46,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
@@ -198,9 +199,8 @@ Summary(pl):        Pliki potrzebne do budowania modu
 Group:         Development/Libraries
 Requires:      apache-devel >= 2.0
 Requires:      perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
+Requires:      perl-Apache-Test
 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
@@ -225,18 +225,15 @@ Perl APIs for mod_perl.
 Perlowe API dla mod_perla.
 
 %prep
-%setup -q -n mod_%{mod_name}-%{version}
+%setup -q -n mod_%{mod_name}-%{version}%{_rc}
 %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 \