X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=ba00e8a544851784261d86fcb34c5da1fd305259;hb=6eaec7d58a91e0cd2986bcd33472bfd99271f6b7;hp=df5a4814d55e17986c7d9fbd4fa23672841d4894;hpb=351bb01eaad19baec76fb08f70f6ae48271eb639;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index df5a481..ba00e8a 100644
--- a/apache.spec
+++ b/apache.spec
@@ -34,7 +34,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.4.3
-Release:	2
+Release:	5
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -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