SPECS: apache1.spec - add conflicts for mod_ssl to avoid duplicate...

[glen]

Author: glen                         Date: Wed Dec 12 08:21:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add conflicts for mod_ssl to avoid duplicate log entries

---- Files affected:
SPECS:
   apache1.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.177 SPECS/apache1.spec:1.178
--- SPECS/apache1.spec:1.177	Mon Dec 10 10:47:57 2007
+++ SPECS/apache1.spec	Wed Dec 12 09:21:16 2007
@@ -29,7 +29,7 @@
 Summary(zh_CN.UTF-8):	Internet 上应用最广泛的 Web 服务程序。
 Name:		apache1
 Version:	1.3.39
-Release:	5
+Release:	6
 License:	Apache Group
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -257,6 +257,7 @@
 Obsoletes:	apache-extra
 Obsoletes:	apache6
 Conflicts:	apache1 < 1.3.37-4
+Conflicts:	apache1-mod_ssl < 2.8.30_1.3.39-3
 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
@@ -2237,7 +2238,7 @@
 %files -n htpasswd-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/htpasswd
-%{_sbindir}/htpasswd
+%attr(755,root,root) %{_sbindir}/htpasswd
 %{_mandir}/man1/htpasswd.1*
 
 %files mod_access
@@ -2435,6 +2436,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2007-12-12 08:21:16  glen
+- add conflicts for mod_ssl to avoid duplicate log entries
+
 Revision 1.177  2007-12-10 09:47:57  glen
 - rel 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache1.spec?r1=1.177&r2=1.178&f=u