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

glen glen at pld-linux.org
Mon Aug 30 19:27:11 CEST 2010


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

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

---- Diffs:

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

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



More information about the pld-cvs-commit mailing list