Author: glen Date: Mon Jul 31 00:45:16 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- kill Apache::Test strictness at build time
---- Files affected:
SPECS:
apache-mod_perl.spec (1.143 -> 1.144)
---- Diffs:
================================================================
Index: SPECS/apache-mod_perl.spec
diff -u SPECS/apache-mod_perl.spec:1.143 SPECS/apache-mod_perl.spec:1.144
--- SPECS/apache-mod_perl.spec:1.143 Sun Jul 30 18:53:13 2006
+++ SPECS/apache-mod_perl.spec Mon Jul 31 02:45:11 2006
@@ -4,13 +4,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.28
+%define apache_test_version 1.27
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
@@ -46,7 +45,7 @@
BuildRequires: expat-devel
BuildRequires: gdbm-devel
BuildRequires: openldap-devel >= 2.3.0
-%{!?with_internal_test:BuildRequires: perl-Apache-Test =
1:%{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
@@ -201,7 +200,7 @@
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}}
+Requires: perl-Apache-Test = %{apache_test_version}
Obsoletes: mod_perl
Obsoletes: mod_perl-common
Conflicts: perl-modules < 1:5.8.6-6
@@ -229,15 +228,12 @@
%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 \
@@ -316,6 +312,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.144 2006/07/31 00:45:11 glen
+- kill Apache::Test strictness at build time
+
Revision 1.143 2006/07/30 16:53:13 hawk
- epoch for perl-Apache-Test BR
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apache-mod_perl.spec?r1=1.143&r2=1.144&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
