--- apache-old.spec 2004-05-19 15:17:59 +0400 +++ apache.spec 2004-05-19 17:02:53 +0400 @@ -11,7 +11,7 @@ # EAPI tarball is subset of mod_ssl tarball %define apache_root %_sysconfdir/httpd -%define apache_home %_var/www +%define apache_home %srv_dir %define old_apache_home /home/httpd %define apache_user apache %define apache_group apache @@ -104,6 +104,7 @@ BuildRequires: libdb1-devel libgdbm-devel libmm-devel perl-BSD-Resource perl-CGI perl-Devel-Symdump perl-HTML-Parser perl-URI perl-devel perl-libwww-perl BuildRequires: altlinux-release +BuildRequires: vhosts-filesystem-devel # have to rip libdb4*-devel manually from buildreq'ed line %if_with Master @@ -235,6 +236,7 @@ Summary(uk_UA.KOI8-U): óЦÌØΦ ÆÁÊÌÉ ÄÌÑ ¦ÎÓÔÁÌÑæ§ apache ÔÁ apache-mod_perl Group: System/Servers PreReq: shadow-utils +PreReq: vhosts-filesystem %description common This package contains files required for both apache and apache-mod_perl @@ -671,7 +673,11 @@ %_sysconfdir/httpd/conf/apache-mime.types.default %_sysconfdir/httpd/conf/tables %apache_root/logs -%attr(-,root,%apache_webmaster) %dir %apache_home/ +# Uncomment the following line when apache_home will +# be different with %srv_dir e.g. when it will be +# something like %srv_dir/apache1 (/var/www/apache1), +# but not /var/www. +#%attr(-,root,%apache_webmaster) %dir %apache_home/ %attr(2775,root,%apache_webmaster) %dir %apache_home/html/ %attr(664,root,%apache_webmaster) %config(noreplace) %apache_home/html/*html* %attr(664,root,%apache_webmaster) %apache_home/html/*.gif