From: Graham Leggett <minfrin@apache.org>
Date: Mon, 27 Mar 2006 19:07:47 +0000 (+0000)
Subject: Update the APR dependancies to at least v1.2.0. Add the missing file-cache
X-Git-Tag: 2.2.1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00af0425971e4edd3adbdd9d05581c09b6580cef;p=thirdparty%2Fapache%2Fhttpd.git

Update the APR dependancies to at least v1.2.0. Add the missing file-cache
module to the cache family of modules in the RPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@389224 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index 6bf56045d6c..dd80d02eecb 100644
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -19,7 +19,7 @@ Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: apr-devel, apr-util-devel, openldap-devel, db4-devel, expat-devel, findutils, perl, pkgconfig
 BuildPrereq: /usr/bin/apr-1-config, /usr/bin/apu-1-config
-Requires: apr >= 1.0.2, apr-util >= 1.0.2, gawk, /usr/share/magic.mime, /usr/bin/find, openldap
+Requires: apr >= 1.2.0, apr-util >= 1.2.0, gawk, /usr/share/magic.mime, /usr/bin/find, openldap
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
 Prereq: sh-utils, textutils, /usr/sbin/useradd
 Provides: webserver
@@ -37,7 +37,7 @@ Group: Development/Libraries
 Summary: Development tools for the Apache HTTP server.
 Obsoletes: secureweb-devel, apache-devel
 Requires: libtool, httpd = %{version}
-Requires: apr-devel >= 1.0.2, apr-util-devel >= 1.0.2
+Requires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0
 
 %description devel
 The httpd-devel package contains the APXS binary and other files
@@ -131,7 +131,7 @@ EOF
 	--with-suexec-uidmin=500 --with-suexec-gidmin=500 \
         --with-devrandom \
         --with-ldap --enable-ldap --enable-authnz-ldap \
-        --enable-cache --enable-disk-cache --enable-mem-cache \
+        --enable-cache --enable-disk-cache --enable-mem-cache --enable-file-cache \
 	--enable-ssl --with-ssl \
 	--enable-deflate --enable-cgid \
 	--enable-proxy --enable-proxy-connect \
@@ -397,6 +397,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/mkdir.sh
 
 %changelog
+* Mon Mar 27 2006 Graham Leggett <minfrin@apache.org> 2.2.1-dev
+- Update dependancies on apr and apr-util to at least v1.2.0.
+- Add the missing file-cache module to the cache build.
+
 * Fri Aug 26 2005 Graham Leggett <minfrin@apache.org> 2.1.7
 - Deleting the xml doc files is no longer necessary.
 - Add httxt2dbm to the sbin directory