packages: apache/apache.spec - allow older apr for ac

[glen]

Author: glen                         Date: Tue Aug 30 10:37:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow older apr for ac

---- Files affected:
packages/apache:
   apache.spec (1.629 -> 1.630) 

---- Diffs:

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.629 packages/apache/apache.spec:1.630
--- packages/apache/apache.spec:1.629	Tue Aug 30 12:17:33 2011
+++ packages/apache/apache.spec	Tue Aug 30 12:37:32 2011
@@ -27,10 +27,12 @@
 # this is internal macro, don't change to %%apache_modules_api
 %define		_apache_modules_api 20051115
 
-%if "%{pld_release}" != "ac"
-%define		openssl_ver	0.9.8i
-%else
+%if "%{pld_release}" == "ac"
 %define		openssl_ver	0.9.7d
+%define		apr_ver		1:1.2
+%else
+%define		openssl_ver	0.9.8i
+%define		apr_ver		1:1.4.5
 %endif
 %include	/usr/lib/rpm/macros.perl
 Summary:	The most widely used Web server on the Internet
@@ -104,7 +106,7 @@
 Patch28:	apache-mpm-itk.patch
 Patch29:	libtool-tag.patch
 URL:		http://httpd.apache.org/
-BuildRequires:	apr-devel >= 1:1.4.5
+BuildRequires:	apr-devel >= %{apr_ver}
 BuildRequires:	apr-util-devel >= 1:1.3.10-2
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -199,7 +201,7 @@
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	/sbin/chkconfig
-Requires:	apr >= 1:1.4.5
+Requires:	apr >= %{apr_ver}
 Requires:	psmisc >= 20.1
 Requires:	rc-scripts >= 0.4.1.23
 Provides:	apache(modules-api) = %{_apache_modules_api}
@@ -2783,6 +2785,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.630  2011/08/30 10:37:32  glen
+- allow older apr for ac
+
 Revision 1.629  2011/08/30 10:17:33  arekm
 - up to 2.2.20 (in process of being released); fixes CVE-2011-3192
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.629&r2=1.630&f=u