X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=0c38063027f0c14547a3ab4f7aae1c6d5baff565;hb=881e70749fbebcc6e741dc50376c0ac303687000;hp=ba4154d800b0ad7d009ce905c66fdb6dfddcab22;hpb=c2d37e8b836ee01825adc19b316a1bb090bbdd68;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index ba4154d..0c38063 100644
--- 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.1
-Release:	0.6
+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:	4366afbea8149ca125af01fd59a2f8a2
+# 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)
@@ -1940,6 +1940,7 @@ Summary:	Session support
 Group:		Networking/Daemons/HTTP
 URL:		http://httpd.apache.org/docs/2.4/mod/mod_session.html
 Requires:	%{name}-base = %{version}-%{release}
+Requires:	apache(mod_dbd) = %{version}-%{release}
 Provides:	apache(mod_session) = %{version}-%{release}
 Provides:	apache(mod_session_cookie) = %{version}-%{release}
 Provides:	apache(mod_session_dbd) = %{version}-%{release}
@@ -2280,8 +2281,8 @@ echo "LoadModule authz_dbd_module	modules/mod_authz_dbd.so" > $CFG/00_mod_authz_
 echo "LoadModule buffer_module	modules/mod_buffer.so" > $CFG/00_mod_buffer.conf
 echo "LoadModule data_module	modules/mod_data.so" > $CFG/00_mod_data.conf
 echo "LoadModule dialup_module	modules/mod_dialup.so" > $CFG/00_mod_dialup.conf
-echo "LoadModule heartbeat_module	modules/mod_heartbeat.so" > $CFG/00_mod_heartbeat.conf
-echo "LoadModule heartmonitor_module	modules/mod_heartmonitor.so" > $CFG/00_mod_heartmonitor.conf
+echo "LoadModule heartbeat_module	modules/mod_heartbeat.so" > $CFG/01_mod_heartbeat.conf
+echo "LoadModule heartmonitor_module	modules/mod_heartmonitor.so" > $CFG/01_mod_heartmonitor.conf
 echo "#LoadModule lbmethod_bybusyness_module	modules/mod_lbmethod_bybusyness.so" > $CFG/00_mod_lbmethod.conf
 echo "#LoadModule lbmethod_byrequests_module	modules/mod_lbmethod_byrequests.so" >> $CFG/00_mod_lbmethod.conf
 echo "#LoadModule lbmethod_bytraffic_module	modules/mod_lbmethod_bytraffic.so" >> $CFG/00_mod_lbmethod.conf
@@ -2318,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
@@ -2712,6 +2716,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_suexec.so
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_suexec.conf
 %{_mandir}/man8/suexec.8*
+%{_mandir}/man8/fcgistarter.8*
 
 %files index
 %defattr(644,root,root,755)
@@ -2732,7 +2737,7 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/apxs
+%attr(755,root,root) %{_sbindir}/apxs
 %attr(755,root,root) %{_sbindir}/envvars*
 %dir %{_libexecdir}
 %dir %{_libexecdir}/build