- test -n seems to fail, "not" -z seems to work properly

[packages/apache.git] / apache.spec

diff --git a/apache.spec b/apache.spec
index 4203cf260d7ead02b681da2684757e34e18811dd..ba4154d800b0ad7d009ce905c66fdb6dfddcab22 100644 (file)
--- 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.6
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -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
@@ -2349,7 +2362,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