- added lfs patch

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

diff --git a/crossmingw32-zlib.spec b/crossmingw32-zlib.spec
index 39c1780571ced2765eae3aa8dfd315518f661499..e751f1f1cab4a01ce39d9e2a07064b9eb3a2b214 100644 (file)
--- a/crossmingw32-zlib.spec
+++ b/crossmingw32-zlib.spec
@@ -1,9 +1,9 @@
 #
 # Conditional build:
-%bcond_without asmopt  # without assmbler optimization for i586+
+%bcond_without asmopt  # without assembler optimization for i686+
 #
 # disable asmopt where not applicable
-%ifarch i386 i486
+%ifarch i386 i486 i586
 %undefine      with_asmopt
 %endif
 %ifnarch %{ix86}
@@ -13,15 +13,15 @@
 Summary:       Library for compression and decompression - Ming32 cross version
 Summary(pl.UTF-8):     Biblioteka z podprogramami do kompresji i dekompresji - wersja skrośna dla Ming32
 Name:          crossmingw32-%{realname}
-Version:       1.2.3
-Release:       1
+Version:       1.2.5
+Release:       2
 License:       BSD
 Group:         Development/Libraries
-Source0:       http://www.zlib.net/%{realname}-%{version}.tar.gz
-# Source0-md5: debc62758716a169df9f62e6ab2bc634
-Patch0:                %{realname}-asmopt.patch
-Patch1:                %{name}-shared.patch
-URL:           http://www.zlib.org/
+Source0:       http://www.zlib.net/current/%{realname}-%{version}.tar.gz
+# Source0-md5: c735eab2d659a96e5a594c9e8541ad63
+Patch0:                %{name}-LFS.patch
+Patch1:                %{realname}-lfs.patch
+URL:           http://www.zlib.net/
 BuildRequires: crossmingw32-gcc
 BuildRequires: sed >= 4.0
 Requires:      crossmingw32-runtime
@@ -31,12 +31,11 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
-%define                arch                    %{_prefix}/%{target}
-%define                gccarch                 %{_prefix}/lib/gcc-lib/%{target}
-%define                gcclib                  %{_prefix}/lib/gcc-lib/%{target}/%{version}
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
+%define                _pkgconfigdir           %{_prefix}/lib/pkgconfig
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
@@ -90,36 +89,28 @@ zlib - biblioteka DLL dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
+%patch0 -p1
 %patch1 -p1
 
 %if %{with asmopt}
-%patch0 -p1
 %ifarch i686 athlon
 cp contrib/asm686/match.S .
 %endif
-%ifarch i586
-cp contrib/asm586/match.S .
 %endif
-%endif
-
-# fix for underline test
-#sed -i -e 's/nm/%{target}-nm/' configure
-# but it's broken anyway (tries to use mmap test remains, but there is no mmap
-# in mingw32) - so hardcode that underline is needed
-sed -i -e 's/.*grep _hello.*/if false; then/' configure
-# vim '
 
 %build
-CC="%{__cc}" \
-CXX="%{__cxx}" \
-AR="%{target}-ar rc" \
-RANLIB="%{target}-ranlib" \
-CFLAGS="-D_REENTRANT %{rpmcflags}%{?with_asmopt: -DASMV}" \
-./configure \
-       --prefix=%{_prefix}
-
-%{__make}
-%{__make} z.dll
+%{__make} -fwin32/Makefile.gcc all \
+       CC="%{__cc}" \
+       CXX="%{__cxx}" \
+       AR="%{target}-ar" \
+       RANLIB="%{target}-ranlib" \
+       CFLAGS="-D_REENTRANT -D_LARGEFILE64_SOURCE=1 %{rpmcflags}%{?with_asmopt: -DASMV}" \
+       DLLWRAP="%{target}-dllwrap" \
+       RC="%{target}-windres" \
+       CP="install" \
+       IMPLIB="libz.dll.a" \
+       prefix="%{_prefix}" \
+       %{?with_asmopt:OBJA=match.o}
 
 # used by libtool to detect dependencies
 cat << "EOF" >> libz.la
@@ -129,7 +120,7 @@ cat << "EOF" >> libz.la
 # Made by czarny czarny at pld-linux.org
 
 # The name that we can dlopen(3).
-dlname='../bin/libz.dll'
+dlname='../bin/zlib1.dll'
 
 # Names of this library.
 library_names='libz.dll.a'
@@ -159,22 +150,25 @@ dlpreopen=''
 libdir='%{_libdir}'
 EOF
 
+sed -e 's=@prefix@=%{_prefix}=;s=@exec_prefix@=%{_prefix}=;s=@libdir@=%{_libdir}=;s=@includedir@=%{_includedir}=;s=@VERSION@=%{version}=' \
+       < zlib.pc.in > zlib.pc
+
 %if 0%{!?debug:1}
-%{target}-strip -R.comment -R.note z.dll
+%{target}-strip -R.comment -R.note zlib1.dll
 %{target}-strip -g -R.comment -R.note *.a
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_dlldir}}
-
-%{__make} install \
-       prefix=$RPM_BUILD_ROOT%{_prefix}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir},%{_dlldir},%{_pkgconfigdir}}
 
-install zutil.h $RPM_BUILD_ROOT%{_includedir}
+install zlib.h $RPM_BUILD_ROOT%{_includedir}
+install zconf.h $RPM_BUILD_ROOT%{_includedir}
 install libz.dll.a $RPM_BUILD_ROOT%{_libdir}
+install libz.a $RPM_BUILD_ROOT%{_libdir}
 install libz.la $RPM_BUILD_ROOT%{_libdir}
-install z.dll $RPM_BUILD_ROOT%{_dlldir}/libz.dll
+install zlib1.dll $RPM_BUILD_ROOT%{_dlldir}
+install zlib.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 rm -rf $RPM_BUILD_ROOT%{_datadir}/man
 
@@ -185,7 +179,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libz.dll.a
 %{_libdir}/libz.la
-%{_includedir}/*.h
+%{_includedir}/zconf.h
+%{_includedir}/zlib.h
+%{_pkgconfigdir}/zlib.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -193,4 +189,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libz.dll
+%{_dlldir}/zlib1.dll