- release 2

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 37b47d06d07c9012a8d9a30f31eab379b5ab5b0b..d2f9eb89ff30be19b1f258c8fcd13652825039cc 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -33,12 +33,12 @@ Summary(pt_BR.UTF-8):       Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):     Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
-Version:       2.2.8
-Release:       6
+Version:       2.2.9
+Release:       2
 License:       Apache
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 39a755eb0f584c279336387b321e3dfc
+# Source0-md5: 80d3754fc278338033296f0d41ef2c04
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -81,6 +81,7 @@ Patch7:               %{name}-syslibs.patch
 Patch8:                httpd-2.0.45-encode.patch
 Patch9:                %{name}-paths.patch
 Patch10:       httpd-2.0.46-dav401dest.patch
+Patch11:       %{name}-bug-40970.patch
 Patch12:       httpd-2.0.46-sslmutex.patch
 Patch14:       httpd-2.0.48-corelimit.patch
 Patch15:       httpd-2.0.48-debuglog.patch
@@ -102,7 +103,7 @@ BuildRequires:      db-devel
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel >= 1.8.3
 BuildRequires: libtool >= 2:1.5
-%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 %{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
 %{?with_ssl:BuildRequires:     openssl-tools >= 0.9.7d}
 BuildRequires: pcre-devel
@@ -1736,6 +1737,7 @@ Dwa programy testowe/przykładowe cgi: test-cgi and print-env.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %patch12 -p1
 %patch14 -p1
 %patch15 -p1
@@ -1762,7 +1764,8 @@ sed -i -e 's,/lib$,/%{_lib},' config.layout
 
 %build
 cp /usr/share/apr/build/apr_common.m4 build
-cp /usr/share/libtool/ltmain.sh build
+%{__libtoolize}
+%{__aclocal} -I build
 cp /usr/share/automake/config.* build
 %{__autoheader}
 %{__autoconf}