packages: crossmingw32-zlib/crossmingw32-zlib.spec - import library must be...

[qboosh]

Author: qboosh                       Date: Sun Mar 21 10:08:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- import library must be named libz.dll.a for -lz to work
- asm586 is no more (dropped upstream)

---- Files affected:
packages/crossmingw32-zlib:
   crossmingw32-zlib.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/crossmingw32-zlib/crossmingw32-zlib.spec
diff -u packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.23 packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.24
--- packages/crossmingw32-zlib/crossmingw32-zlib.spec:1.23	Thu Mar 18 23:47:39 2010
+++ packages/crossmingw32-zlib/crossmingw32-zlib.spec	Sun Mar 21 11:08:06 2010
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	asmopt	# without assmbler optimization for i586+
+%bcond_without	asmopt	# without assmbler optimization for i686+
 #
 # disable asmopt where not applicable
-%ifarch i386 i486
+%ifarch i386 i486 i586
 %undefine	with_asmopt
 %endif
 %ifnarch %{ix86}
@@ -93,9 +93,6 @@
 %ifarch i686 athlon
 cp contrib/asm686/match.S .
 %endif
-%ifarch i586
-cp contrib/asm586/match.S .
-%endif
 %endif
 
 %build
@@ -107,8 +104,9 @@
 	CFLAGS="-D_REENTRANT %{rpmcflags}%{?with_asmopt: -DASMV}" \
 	DLLWRAP="%{target}-dllwrap" \
 	RC="%{target}-windres" \
-	prefix="%{_prefix}" \
 	CP="install" \
+	IMPLIB="libz.dll.a" \
+	prefix="%{_prefix}" \
 	%{?with_asmopt:OBJA=match.o}
 
 # used by libtool to detect dependencies
@@ -122,7 +120,7 @@
 dlname='../bin/zlib1.dll'
 
 # Names of this library.
-library_names='libzdll.a'
+library_names='libz.dll.a'
 
 # The name of the static archive.
 old_library='libz.a'
@@ -163,7 +161,7 @@
 
 install zlib.h $RPM_BUILD_ROOT%{_includedir}
 install zconf.h $RPM_BUILD_ROOT%{_includedir}
-install libzdll.a $RPM_BUILD_ROOT%{_libdir}
+install libz.dll.a $RPM_BUILD_ROOT%{_libdir}
 install libz.a $RPM_BUILD_ROOT%{_libdir}
 install libz.la $RPM_BUILD_ROOT%{_libdir}
 install zlib1.dll $RPM_BUILD_ROOT%{_dlldir}
@@ -176,7 +174,7 @@
 
 %files
 %defattr(644,root,root,755)
-%{_libdir}/libzdll.a
+%{_libdir}/libz.dll.a
 %{_libdir}/libz.la
 %{_includedir}/zconf.h
 %{_includedir}/zlib.h
@@ -196,6 +194,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2010/03/21 10:08:06  qboosh
+- import library must be named libz.dll.a for -lz to work
+- asm586 is no more (dropped upstream)
+
 Revision 1.23  2010/03/18 22:47:39  wiget
 - use win32/Makefile.gcc for building (for compatibility with other zlib DLL distributors)
 - drop shared.patch (unused now)
================================================================

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