- updated to 1.2.11

[packages/crossmingw32-zlib.git] / crossmingw32-zlib.spec

diff --git a/crossmingw32-zlib.spec b/crossmingw32-zlib.spec
index bbe592bbe13d3a5ddb4de41018e748f37f0af7e2..73c8a17f700ae1cc4f37bdeca1d0d2972e90825a 100644 (file)
--- 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,14 +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.5
-Release:       2
+Version:       1.2.11
+Release:       1
 License:       BSD
 Group:         Development/Libraries
 Source0:       http://www.zlib.net/current/%{realname}-%{version}.tar.gz
-# Source0-md5: c735eab2d659a96e5a594c9e8541ad63
-Patch0:                %{name}-LFS.patch
-Patch1:                %{realname}-lfs.patch
+# Source0-md5: 1c9f62f0778697a09d36121ead88e08e
 URL:           http://www.zlib.net/
 BuildRequires: crossmingw32-gcc
 BuildRequires: sed >= 4.0
@@ -39,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
@@ -89,8 +94,6 @@ zlib - biblioteka DLL dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %if %{with asmopt}
 %ifarch i686 athlon
@@ -120,7 +123,7 @@ cat << "EOF" >> libz.la
 # Made by czarny czarny at pld-linux.org
 
 # The name that we can dlopen(3).
-dlname='../bin/zlib1.dll'
+dlname='%{_dlldir}/zlib1.dll'
 
 # Names of this library.
 library_names='libz.dll.a'
@@ -150,7 +153,7 @@ dlpreopen=''
 libdir='%{_libdir}'
 EOF
 
-sed -e 's=@prefix@=%{_prefix}=;s=@exec_prefix@=%{_prefix}=;s=@libdir@=%{_libdir}=;s=@includedir@=%{_includedir}=;s=@VERSION@=%{version}=' \
+sed -e 's=@prefix@=%{_prefix}=;s=@exec_prefix@=%{_prefix}=;s=@\(shared\)\?libdir@=%{_libdir}=;s=@includedir@=%{_includedir}=;s=@VERSION@=%{version}=' \
        < zlib.pc.in > zlib.pc
 
 %if 0%{!?debug:1}
@@ -170,8 +173,6 @@ install libz.la $RPM_BUILD_ROOT%{_libdir}
 install zlib1.dll $RPM_BUILD_ROOT%{_dlldir}
 install zlib.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/man
-
 %clean
 rm -rf $RPM_BUILD_ROOT