SPECS: apache1.spec - drop bogus conflicts

glen glen at pld-linux.org
Tue Oct 17 11:55:04 CEST 2006


Author: glen                         Date: Tue Oct 17 09:55:04 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop bogus conflicts

---- Files affected:
SPECS:
   apache1.spec (1.157 -> 1.158) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.157 SPECS/apache1.spec:1.158
--- SPECS/apache1.spec:1.157	Tue Oct 17 11:53:32 2006
+++ SPECS/apache1.spec	Tue Oct 17 11:54:58 2006
@@ -120,7 +120,6 @@
 Requires:	%{name}-mod_dir = %{version}-%{release}
 Requires:	%{name}-mod_log_config = %{version}-%{release}
 Requires:	%{name}-mod_mime = %{version}-%{release}
-Conflicts:	apache1 < 1.3.37-3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/apache
@@ -2452,6 +2451,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.158  2006/10/17 09:54:58  glen
+- drop bogus conflicts
+
 Revision 1.157  2006/10/17 09:53:32  glen
 - conflicts before package split
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.157&r2=1.158&f=u



More information about the pld-cvs-commit mailing list