packages: apache/apache.spec - restore openssl version for ac

[glen]

Author: glen                         Date: Fri Oct 30 15:18:13 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restore openssl version for ac

---- Files affected:
packages/apache:
   apache.spec (1.580 -> 1.581) 

---- Diffs:

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.580 packages/apache/apache.spec:1.581
--- packages/apache/apache.spec:1.580	Fri Oct 30 11:52:53 2009
+++ packages/apache/apache.spec	Fri Oct 30 16:18:08 2009
@@ -10,6 +10,12 @@
 %include	/usr/lib/rpm/macros.perl
 # 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
+%define		openssl_ver	0.9.7d
+%endif
 Summary:	The most widely used Web server on the Internet
 Summary(de.UTF-8):	Leading World Wide Web-Server
 Summary(es.UTF-8):	Servidor HTTPD para proveer servicios WWW
@@ -83,9 +89,10 @@
 BuildRequires:	gdbm-devel >= 1.8.3
 BuildRequires:	libtool >= 2:1.5
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
-%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.8i}
-%{?with_ssl:BuildRequires:	openssl-tools >= 0.9.8i}
+%{?with_ssl:BuildRequires:	openssl-devel >= %{openssl_version}}
+%{?with_ssl:BuildRequires:	openssl-tools >= %{openssl_version}}
 BuildRequires:	pcre-devel
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -1513,7 +1520,7 @@
 Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.2/mod/mod_ssl.html
 Requires:	%{name}-base = %{version}-%{release}
-Requires:	openssl >= 0.9.8i
+Requires:	openssl >= %{openssl_version}
 %if "%{pld_release}" != "ac"
 Requires:	apr-util-dbm-db
 %endif
@@ -2706,6 +2713,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.581  2009/10/30 15:18:08  glen
+- restore openssl version for ac
+
 Revision 1.580  2009/10/30 10:52:53  glen
 - release 6
 
================================================================

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