packages: zlib/zlib.spec - rel 3; better poldek conflict

[arekm]

Author: arekm                        Date: Tue Feb 23 16:49:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; better poldek conflict

---- Files affected:
packages/zlib:
   zlib.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.128 packages/zlib/zlib.spec:1.129
--- packages/zlib/zlib.spec:1.128	Mon Feb 22 20:07:36 2010
+++ packages/zlib/zlib.spec	Tue Feb 23 17:49:07 2010
@@ -33,7 +33,7 @@
 Summary(uk.UTF-8):	Бібліотека для компресії та декомпресії
 Name:		zlib
 Version:	1.2.3.9
-Release:	2
+Release:	3
 Patch0:		minizip-autotools.patch
 Patch1:		define-off64_t
 License:	BSD
@@ -46,7 +46,7 @@
 BuildRequires:	libtool
 BuildRequires:	rpm >= 4.4.9-56
 Obsoletes:	zlib1
-Conflicts:	poldek-libs < 0.30-0.20080820.23.37
+Conflicts:	poldek-libs < 0.30-0.20080820.23.38
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -394,6 +394,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2010/02/23 16:49:07  arekm
+- rel 3; better poldek conflict
+
 Revision 1.128  2010/02/22 19:07:36  arekm
 - rel 2; C with older poldek (old poldek used modes that weren't supported but were silently ignored in older zlib)
 
================================================================

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