- rel 4

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 4203cf260d7ead02b681da2684757e34e18811dd..4399236ed3f6968dbaa4c840954ece4eebcb6bea 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.1
-Release:       0.5
+Version:       2.4.3
+Release:       4
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 4366afbea8149ca125af01fd59a2f8a2
+# Source0-md5: 538dccd22dd18466fff3ec7948495417
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -502,6 +502,7 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający dostęp anonimowych użytkown
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_authn_anon.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authn_core) = %{version}-%{release}
 Provides:      apache(mod_authn_anon) = %{version}-%{release}
 # compat
 Provides:      apache(mod_auth_anon) = %{version}-%{release}
@@ -527,7 +528,8 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający uwierzytelnianie użytkownik
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_authn_dbd.html
 Requires:      %{name}-base = %{version}-%{release}
-Requires:      %{name}-mod_dbd = %{version}-%{release}
+Requires:      apache(mod_dbd) = %{version}-%{release}
+Requires:      apache(mod_authn_core) = %{version}-%{release}
 Provides:      apache(mod_authn_dbd) = %{version}-%{release}
 
 %description mod_authn_dbd
@@ -546,6 +548,7 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający uwierzytelnianie użytkownik
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_authn_dbm.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authn_core) = %{version}-%{release}
 Provides:      apache(mod_authn_dbm) = %{version}-%{release}
 
 %description mod_authn_dbm
@@ -585,6 +588,7 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający uwierzytelnianie użytkownik
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_authn_file.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authn_core) = %{version}-%{release}
 Provides:      apache(mod_authn_file) = %{version}-%{release}
 
 %description mod_authn_file
@@ -625,6 +629,7 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający uwierzytelnianie grup z użyc
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_authz_dbm.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authz_core) = %{version}-%{release}
 Provides:      apache(mod_authz_dbm) = %{version}-%{release}
 
 %description mod_authz_dbm
@@ -663,6 +668,7 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający autoryzację grup przy użyci
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_authz_groupfile.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authz_core) = %{version}-%{release}
 Provides:      apache(mod_authz_groupfile) = %{version}-%{release}
 
 %description mod_authz_groupfile
@@ -681,6 +687,7 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający autoryzację grup w oparcu o
 Group:         Networking/Daemons/HTTP
 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}
@@ -708,6 +715,7 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający autoryzacje w oparciu o włas
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/en/mod/mod_authz_owner.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authz_core) = %{version}-%{release}
 #Requires:     any-auth-module
 Provides:      apache(mod_authz_owner) = %{version}-%{release}
 
@@ -732,6 +740,7 @@ Summary(pl.UTF-8):  Moduł Apache'a umożliwiający autoryzację użytkowników
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/en/mod/mod_authz_user.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authz_core) = %{version}-%{release}
 Provides:      apache(mod_authz_user) = %{version}-%{release}
 
 %description mod_authz_user
@@ -1546,6 +1555,7 @@ Epoch:            1
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_ssl.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_socache_shmcb) = %{version}-%{release}
 Requires:      openssl >= %{openssl_ver}
 %if "%{pld_release}" != "ac"
 Requires:      apr-util-dbm-db
@@ -1746,6 +1756,7 @@ Summary:  Manages a cache of authentication credentials to relieve the load on ba
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_authn_socache.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authn_core) = %{version}-%{release}
 Provides:      apache(mod_authn_socache) = %{version}-%{release}
 
 %description mod_authn_socache
@@ -1757,6 +1768,8 @@ Summary:  Group Authorization and Login using SQL
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_authz_dbd.html
 Requires:      %{name}-base = %{version}-%{release}
+Requires:      apache(mod_authz_core) = %{version}-%{release}
+Requires:      apache(mod_dbd) = %{version}-%{release}
 Provides:      apache(mod_authz_dbd) = %{version}-%{release}
 
 %description mod_authz_dbd
@@ -1802,8 +1815,8 @@ Summary:  Sends messages with server status to frontend proxy
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_heartbeat.html
 Requires:      %{name}-base = %{version}-%{release}
-Requires:      %{name}-mod_status = %{version}-%{release}
-Requires:      %{name}-mod_watchdog = %{version}-%{release}
+Requires:      apache(mod_status) = %{version}-%{release}
+Requires:      apache(mod_watchdog) = %{version}-%{release}
 Provides:      apache(mod_heartbeat) = %{version}-%{release}
 
 %description mod_heartbeat
@@ -1821,8 +1834,8 @@ Summary:  Centralized monitor for mod_heartbeat origin servers
 Group:         Networking/Daemons/HTTP
 URL:           http://httpd.apache.org/docs/2.4/mod/mod_heartmonitor.html
 Requires:      %{name}-base = %{version}-%{release}
-Requires:      %{name}-mod_status = %{version}-%{release}
-Requires:      %{name}-mod_watchdog = %{version}-%{release}
+Requires:      apache(mod_status) = %{version}-%{release}
+Requires:      apache(mod_watchdog) = %{version}-%{release}
 Provides:      apache(mod_heartmonitor) = %{version}-%{release}
 
 %description mod_heartmonitor
@@ -1927,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}
@@ -2267,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
@@ -2305,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
@@ -2349,7 +2366,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
@@ -2699,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)
@@ -2719,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