packages: zlib/zlib.spec - conflict with broken libxml

[glen]

Author: glen                         Date: Mon Aug 30 17:26:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- conflict with broken libxml

---- Files affected:
packages/zlib:
   zlib.spec (1.139 -> 1.140) 

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.139 packages/zlib/zlib.spec:1.140
--- packages/zlib/zlib.spec:1.139	Sun Aug 22 13:18:16 2010
+++ packages/zlib/zlib.spec	Mon Aug 30 19:26:05 2010
@@ -32,6 +32,7 @@
 BuildRequires:	libtool
 BuildRequires:	rpm >= 4.4.9-56
 Obsoletes:	zlib1
+Conflicts:	libxml2 < 1:2.7.6-6
 Conflicts:	poldek-libs < 0.30-0.20080820.23.40
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -381,6 +382,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.140  2010/08/30 17:26:05  glen
+- conflict with broken libxml
+
 Revision 1.139  2010/08/22 11:18:16  glen
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/zlib/zlib.spec?r1=1.139&r2=1.140&f=u