- rel 2: build with new webserver virtuals

[packages/apache1.git] / apache1.spec

diff --git a/apache1.spec b/apache1.spec
index 506834634a8a31757c9321e4e400496f1a42d85d..b90f6f0ff1e21aaaf6e3f802255edaf467ecc5a0 100644 (file)
--- a/apache1.spec
+++ b/apache1.spec
@@ -29,7 +29,7 @@ Summary(uk):  
 Summary(zh_CN):        Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:          apache1
 Version:       1.3.36
-Release:       1.1
+Release:       2
 License:       Apache Group
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -443,6 +443,7 @@ Summary(pl):        Kontrola dost
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_access) = %{version}-%{release}
+Provides:      webserver(access)
 
 %description mod_access
 The directives provided by mod_access are used in <Directory>,
@@ -490,6 +491,7 @@ Summary(pl):        Odwzorowywanie cz
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_alias) = %{version}-%{release}
+Provides:      webserver(alias)
 
 %description mod_alias
 This module provides for mapping different parts of the host
@@ -564,6 +566,7 @@ Group:              Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Requires:      htpasswd
 Provides:      apache(mod_auth) = %{version}-%{release}
+Provides:      webserver(auth)
 Obsoletes:     apache-mod_auth < 2.0.0
 
 %description mod_auth
@@ -686,6 +689,7 @@ Summary(pl):        Wywo
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_cgi) = %{version}-%{release}
+Provides:      webserver(cgi)
 
 %description mod_cgi
 Any file that has the MIME type application/x-httpd-cgi or handler
@@ -754,6 +758,7 @@ Summary(pl):        Modu
 Group:         Networking/Daemons
 Requires:      %{name}(EAPI) = %{version}-%{release}
 Provides:      apache(mod_dir) = %{version}-%{release}
+Provides:      webserver(indexfile)
 Obsoletes:     apache-mod_dir < 2.0.0
 
 %description mod_dir
@@ -1439,8 +1444,8 @@ perl -p -i -e 's/^if ...O ne "MSWin32"./if (0)/' $RPM_BUILD_ROOT%{apxs}
 
 mv $RPM_BUILD_ROOT%{_sysconfdir}/modules/* $RPM_BUILD_ROOT%{_libexecdir}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/modules
-ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
-ln -s /var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
+ln -s ../..%{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules
+ln -s ../../var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs
 
 ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}