SPECS (AC-branch): apache.spec - HEAD merge (logrotate dir)

[glen]

Author: glen                         Date: Sat Dec  8 13:14:59 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge (logrotate dir)

---- Files affected:
SPECS:
   apache.spec (1.498.2.6 -> 1.498.2.7) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.498.2.6 SPECS/apache.spec:1.498.2.7
--- SPECS/apache.spec:1.498.2.6	Sat Dec  8 14:13:24 2007
+++ SPECS/apache.spec	Sat Dec  8 14:14:54 2007
@@ -44,7 +44,7 @@
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}-icons.tar.gz
-# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83
+# Source3-md5:	2b085cbc19fd28536dc883f0b864cd83
 Source4:	%{name}.sysconfig
 Source6:	%{name}-httpd.conf
 Source7:	%{name}-common.conf
@@ -212,6 +212,7 @@
 Obsoletes:	apache-mod_optional_fn_import
 Obsoletes:	apache-mod_optional_hook_import
 Conflicts:	apache < 2.2.0
+Conflicts:	logrotate < 3.7-4
 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
 Conflicts:	rpm < 4.4.2-0.2
 
@@ -1864,7 +1865,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
-	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/httpd,lock/mod_dav} \
+	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
 	$RPM_BUILD_ROOT%{_datadir}/cgi-bin
 
@@ -2296,7 +2297,7 @@
 %{_mandir}/man8/httpd.8*
 
 %attr(2751,root,logs) %dir /var/log/httpd
-%attr(2750,root,logs) %dir /var/log/archiv/httpd
+%attr(2750,root,logs) %dir /var/log/archive/httpd
 %attr(640,root,logs) %ghost /var/log/httpd/*
 
 %dir %{_datadir}
@@ -2711,6 +2712,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.498.2.7  2007-12-08 13:14:54  glen
+- HEAD merge (logrotate dir)
+
 Revision 1.498.2.6  2007-12-08 13:13:24  glen
 - converted to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache.spec?r1=1.498.2.6&r2=1.498.2.7&f=u