packages: zlib/zlib.spec - asm586 is no more (dropped upstream) - added asm...

[qboosh]

Author: qboosh                       Date: Sat Mar 20 10:19:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- asm586 is no more (dropped upstream)
- added asm patch to use --noexecstack when compiling asm code (obsoletes pax bcond)
- release 2

---- Files affected:
packages/zlib:
   zlib.spec (1.132 -> 1.133) 

---- Diffs:

================================================================
Index: packages/zlib/zlib.spec
diff -u packages/zlib/zlib.spec:1.132 packages/zlib/zlib.spec:1.133
--- packages/zlib/zlib.spec:1.132	Mon Mar 15 08:34:34 2010
+++ packages/zlib/zlib.spec	Sat Mar 20 11:19:30 2010
@@ -1,27 +1,12 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	asmopt	# without assembler optimization for i586+
-%bcond_with	pax	# synonym for the above (asm doesn't have non-exec stack attributes)
+%bcond_without	asmopt	# without assembler optimization for i686+
 %bcond_without	tests
 #
-%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
+%ifnarch i686 pentium3 pentium4 athlon %{x8664}
 %undefine	with_asmopt
 %endif
-%if %{with pax} && %{with asmopt}
-%undefine	with_asmopt
-%endif
-
-%if "%{pld_release}" == "ac"
-# on 2.4 kernel i586 doesn't work either:
-# open("/usr/lib/libcrypto.so.0.9.7", O_RDONLY) = 3
-# ...
-# mprotect...= -1 EINVAL (Invalid argument)
-# mprotect...= -1 ENOMEM (Cannot allocate memory)
-%ifarch i586
-%undefine	with_asmopt
-%endif
-%endif
 Summary:	Library for compression and decompression
 Summary(de.UTF-8):	Library für die Komprimierung und Dekomprimierung
 Summary(es.UTF-8):	Biblioteca para compresión y descompresión
@@ -33,12 +18,13 @@
 Summary(uk.UTF-8):	Бібліотека для компресії та декомпресії
 Name:		zlib
 Version:	1.2.4
-Release:	1
-Patch0:		minizip-autotools.patch
+Release:	2
 License:	BSD
 Group:		Libraries
 Source0:	http://www.zlib.net/current/%{name}-%{version}.tar.gz
 # Source0-md5:	47f6ed51b3c83a8534f9228531effa18
+Patch0:		minizip-autotools.patch
+Patch1:		%{name}-asm.patch
 URL:		http://www.zlib.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -292,14 +278,12 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %if %{with asmopt}
 %ifarch i686 pentium3 pentium4 athlon
 cp contrib/asm686/match.S .
 %endif
-%ifarch i586
-cp contrib/asm586/match.S .
-%endif
 %ifarch %{x8664}
 cp contrib/amd64/amd64-match.S match.S
 %endif
@@ -395,6 +379,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2010/03/20 10:19:30  qboosh
+- asm586 is no more (dropped upstream)
+- added asm patch to use --noexecstack when compiling asm code (obsoletes pax bcond)
+- release 2
+
 Revision 1.132  2010/03/15 07:34:34  qboosh
 - dropped define-off64_t patch, <sys/types.h> is included just a few lines before
 
================================================================

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