X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache.spec;h=3ab01e50191d6e3d584bf43490121641fffeb3cc;hb=77bbc0029ed638a098f86ca96866657d9ddf59e9;hp=144e4b0b974cb1dba525324be27a1404ab0069e0;hpb=27f18255c3f0fd80d6cfafc59cbbc2e6ff28f480;p=packages%2Fapache.git

diff --git a/apache.spec b/apache.spec
index 144e4b0..3ab01e5 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.1
-Release:	0.5
+Release:	0.7
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -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
@@ -2362,7 +2363,7 @@ if [ ! -L /etc/httpd/httpd.conf ]; then
 fi
 if [ -f /etc/sysconfig/httpd ]; then
 	MPM=$(grep HTTPD_MPM /etc/sysconfig/httpd |sed 's,HTTPD_MPM=,,;s,",,g')
-	if [ -n $MPM ]; then
+	if [ ! -z $MPM ]; then
 		echo "LoadModule mpm_${MPM}_module                modules/mod_mpm_${MPM}.so" > /etc/httpd/conf.d/10_mpm.conf.rpmnew
 		cat /etc/httpd/conf.d/10_mpm.conf >> /etc/httpd/conf.d/10_mpm.conf.rpmnew
 		mv /etc/httpd/conf.d/10_mpm.conf.rpmnew /etc/httpd/conf.d/10_mpm.conf