- try with apr-1 support

Changed files:
    apache.spec -> 1.336

diff --git a/apache.spec b/apache.spec
index f174b55867f1b3b8096729d37d0d264b20b253e3..d9a9cba4a0164928aaa3b613f37af5a94827fce0 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -17,6 +17,7 @@
 # Conditional build:
 %bcond_without ssl             # build without SSL support
 %bcond_without ldap            # build without LDAP support
+%bcond_with    apr1            # use apr*-1 instead of 0.9.5
 #
 %include       /usr/lib/rpm/macros.perl
 # this is internal macro, don't change to %%apache_modules_api
@@ -82,8 +83,15 @@ Patch21:     %{name}-apxs.patch
 Patch22:       httpd-2.0.50-peruser-r3.patch
 URL:           http://httpd.apache.org/
 BuildRequires: automake
+%if %{with apr1}
+BuildRequires: apr-devel >= 1:1.0.0
+BuildRequires: apr-util-devel >= 1:1.0.0
+%else
 BuildRequires: apr-devel >= 1:0.9.5-6
+BuildRequires: apr-devel < 1:1.0.0
 BuildRequires: apr-util-devel >= 1:0.9.5-5
+BuildRequires: apr-util-devel < 1:1.0.0
+%endif
 BuildRequires: db-devel
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel >= 1.8.3
@@ -108,7 +116,9 @@ Requires(post,postun):      /sbin/ldconfig
 Requires(post):        fileutils
 Requires:      /etc/mime.types
 Requires:      %{name}-apxs = %{version}-%{release}
+%if !%{with apr1}
 Requires:      apr-util >= 1:0.9.5-5
+%endif
 Requires:      mailcap
 Requires:      psmisc >= 20.1
 Provides:      apache(modules-api) = %{_apache_modules_api}
@@ -228,7 +238,11 @@ Summary(pt_BR):    Arquivos de inclus
 Summary(ru):   óÒÅÄÓÔ×Á ÒÁÚÒÁÂÏÔËÉ ÍÏÄÕÌÅÊ ÄÌÑ ×ÅÂ-ÓÅÒ×ÅÒÁ Apache
 Group:         Networking/Utilities
 Requires:      %{name}-apxs = %{version}-%{release}
+%if %{with apr1}
+Requires:      apr-util-devel >= 1:1.0.0
+%else
 Requires:      apr-util-devel >= 1:0.9.5-5
+%endif
 Requires:      libtool
 Obsoletes:     apache-static
 
@@ -763,8 +777,8 @@ install -d "buildmpm-${mpm}"; cd "buildmpm-${mpm}"
        --with-suexec-uidmin=500 \
        --with-suexec-gidmin=500 \
        --with-suexec-umask=077 \
-       --with-apr=%{_bindir} \
-       --with-apr-util=%{_bindir}
+       --with-apr=%{_bindir}/apr%{?with_apr1:-1}-config \
+       --with-apr-util=%{_bindir}/apu%{?with_apr1:-1}-config
 %{__make}
 ./httpd.${mpm} -l | grep -v "${mpm}" > modules-inside