X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossmingw32-zlib.git;a=blobdiff_plain;f=crossmingw32-zlib.spec;h=73c8a17f700ae1cc4f37bdeca1d0d2972e90825a;hp=3987106518745694c00309355f736387d17ea00f;hb=f748f83b203cc9cf40414c910b0571ec58f682e7;hpb=4d757ee0e7af673133e6c65c24040d7a17325af9

diff --git a/crossmingw32-zlib.spec b/crossmingw32-zlib.spec
index 3987106..73c8a17 100644
--- a/crossmingw32-zlib.spec
+++ b/crossmingw32-zlib.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
-%bcond_without	asmopt	# without assembler optimization for i686+
+%bcond_with	asmopt	# without assembler optimization for i686+
+			# (asm is unsupported by upstream and unmaintained)
 #
 # disable asmopt where not applicable
 %ifarch i386 i486 i586
@@ -13,12 +14,12 @@
 Summary:	Library for compression and decompression - MinGW32 cross version
 Summary(pl.UTF-8):	Biblioteka z podprogramami do kompresji i dekompresji - wersja skrośna dla MinGW32
 Name:		crossmingw32-%{realname}
-Version:	1.2.7
+Version:	1.2.11
 Release:	1
 License:	BSD
 Group:		Development/Libraries
 Source0:	http://www.zlib.net/current/%{realname}-%{version}.tar.gz
-# Source0-md5:	60df6a37c56e7c1366cca812414f7b85
+# Source0-md5:	1c9f62f0778697a09d36121ead88e08e
 URL:		http://www.zlib.net/
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	sed >= 4.0
@@ -37,11 +38,17 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
+%define		__pkgconfig_provides	%{nil}
+%define		__pkgconfig_requires	%{nil}
 
 %ifarch alpha sparc sparc64 sparcv9
 %define		optflags	-O2
 %endif
 
+# -z options are invalid for mingw linker, most of -f options are Linux-specific
+%define		filterout_ld	-Wl,-z,.*
+%define		filterout_c		-f[-a-z0-9=]*
+
 %description
 The 'zlib' compression library provides in-memory compression and
 decompression functions, including integrity checks of the