- rel 2, rebuild with new apr-util

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index df5a4814d55e17986c7d9fbd4fa23672841d4894..0c38063027f0c14547a3ab4f7aae1c6d5baff565 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.4.3
+Version:       2.4.4
 Release:       2
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 538dccd22dd18466fff3ec7948495417
+# Source0-md5: a2fed766e67c9681e0d9b86768f08286
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -689,8 +689,8 @@ URL:                http://httpd.apache.org/docs/2.4/mod/mod_authz_host.html
 Requires:      %{name}-base = %{version}-%{release}
 Requires:      apache(mod_authz_core) = %{version}-%{release}
 Provides:      apache(mod_authz_host) = %{version}-%{release}
-# for upgrade from 2.2, maybe this should be a "Suggests", but it's safer to require it by force
-Requires:      apache(mod_access_compat) = %{version}-%{release}
+# for upgrade from 2.2
+Suggests:      apache(mod_access_compat) = %{version}-%{release}
 # for apache < 2.2.0
 Provides:      apache(mod_access) = %{version}-%{release}
 Provides:      webserver(access)
@@ -2319,6 +2319,9 @@ s/^.*\.\(pt-br\)/%%lang(pt_BR) &/
 ' >> "$cur/manual.files"
 cd $cur
 
+# move apxs to _sbindir
+mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/apxs
+
 # cgi_test: create config file with ScriptAlias
 cat << 'EOF' > $CFG/09_cgi_test.conf
 ScriptAlias /cgi-bin/printenv %{_cgibindir}/printenv