packages: zlib/zlib.spec - rel 4; poldek C bumped again

[arekm]

Author: arekm                        Date: Sun Feb 28 08:54:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; poldek C bumped again

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

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.129 packages/zlib/zlib.spec:1.130
--- packages/zlib/zlib.spec:1.129	Tue Feb 23 17:49:07 2010
+++ packages/zlib/zlib.spec	Sun Feb 28 09:54:43 2010
@@ -5,6 +5,7 @@
 %bcond_with	pax	# synonym for the above (asm doesn't have non-exec stack attributes)
 %bcond_without	tests
 #
+# no x8664 at this moment, broken, doesn't pass test suite, should be fixed in 1.2.3.10
 %ifnarch i586 i686 pentium3 pentium4 athlon
 %undefine	with_asmopt
 %endif
@@ -33,7 +34,7 @@
 Summary(uk.UTF-8):	Бібліотека для компресії та декомпресії
 Name:		zlib
 Version:	1.2.3.9
-Release:	3
+Release:	4
 Patch0:		minizip-autotools.patch
 Patch1:		define-off64_t
 License:	BSD
@@ -46,7 +47,7 @@
 BuildRequires:	libtool
 BuildRequires:	rpm >= 4.4.9-56
 Obsoletes:	zlib1
-Conflicts:	poldek-libs < 0.30-0.20080820.23.38
+Conflicts:	poldek-libs < 0.30-0.20080820.23.40
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -302,6 +303,9 @@
 %ifarch i586
 cp contrib/asm586/match.S .
 %endif
+%ifarch %{x8664}
+cp contrib/amd64/amd64-match.S match.S
+%endif
 %endif
 
 %build
@@ -394,6 +398,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.130  2010/02/28 08:54:43  arekm
+- rel 4; poldek C bumped again
+
 Revision 1.129  2010/02/23 16:49:07  arekm
 - rel 3; better poldek conflict
 
================================================================

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