- asm586 is no more (dropped upstream)
Changed files:
crossmingw32-zlib.spec -> 1.24
-%bcond_without asmopt # without assmbler optimization for i586+
+%bcond_without asmopt # without assmbler optimization for i686+
#
# disable asmopt where not applicable
#
# disable asmopt where not applicable
%undefine with_asmopt
%endif
%ifnarch %{ix86}
%undefine with_asmopt
%endif
%ifnarch %{ix86}
%ifarch i686 athlon
cp contrib/asm686/match.S .
%endif
%ifarch i686 athlon
cp contrib/asm686/match.S .
%endif
-%ifarch i586
-cp contrib/asm586/match.S .
-%endif
CFLAGS="-D_REENTRANT %{rpmcflags}%{?with_asmopt: -DASMV}" \
DLLWRAP="%{target}-dllwrap" \
RC="%{target}-windres" \
CFLAGS="-D_REENTRANT %{rpmcflags}%{?with_asmopt: -DASMV}" \
DLLWRAP="%{target}-dllwrap" \
RC="%{target}-windres" \
+ IMPLIB="libz.dll.a" \
+ prefix="%{_prefix}" \
%{?with_asmopt:OBJA=match.o}
# used by libtool to detect dependencies
%{?with_asmopt:OBJA=match.o}
# used by libtool to detect dependencies
dlname='../bin/zlib1.dll'
# Names of this library.
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'
# The name of the static archive.
old_library='libz.a'
install zlib.h $RPM_BUILD_ROOT%{_includedir}
install zconf.h $RPM_BUILD_ROOT%{_includedir}
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}
install libz.a $RPM_BUILD_ROOT%{_libdir}
install libz.la $RPM_BUILD_ROOT%{_libdir}
install zlib1.dll $RPM_BUILD_ROOT%{_dlldir}
%files
%defattr(644,root,root,755)
%files
%defattr(644,root,root,755)
%{_libdir}/libz.la
%{_includedir}/zconf.h
%{_includedir}/zlib.h
%{_libdir}/libz.la
%{_includedir}/zconf.h
%{_includedir}/zlib.h