]> git.pld-linux.org Git - packages/apache.git/commitdiff
- allow older apr for ac
authorElan Ruusamäe <glen@pld-linux.org>
Tue, 30 Aug 2011 10:37:32 +0000 (10:37 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    apache.spec -> 1.630

apache.spec

index a5792752286a654d6cd9beb38c6695f7aa24e44c..cbfcf4427f55989c9029c70a4c2575bd4f41fbe8 100644 (file)
 # 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
@@ -103,7 +105,7 @@ Patch26:    apache-mod_vhost_alias_docroot.patch
 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
@@ -198,7 +200,7 @@ Requires(pre):      /usr/bin/getgid
 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}
This page took 0.171854 seconds and 4 git commands to generate.