From: Daniel P. Berrange <"Daniel P. Berrange "> Date: Wed, 10 Sep 2008 16:29:19 +0000 (-0400) Subject: Fix zlib DLL name X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=071db97d31315a919a7579565b973ce6558d792b;p=fedora-mingw.git Fix zlib DLL name --- diff --git a/zlib/mingw-zlib.spec b/zlib/mingw-zlib.spec index 3874cb2..7ab1a94 100644 --- a/zlib/mingw-zlib.spec +++ b/zlib/mingw-zlib.spec @@ -55,12 +55,9 @@ mkdir -p $RPM_BUILD_ROOT%{_mingw_mandir}/man3 make -f win32/Makefile.gcc \ INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw_includedir} \ LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw_libdir} \ + BINARY_PATH=$RPM_BUILD_ROOT%{_mingw_bindir} \ install -# DLL needs to go in the bin directory. -mv $RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll \ - $RPM_BUILD_ROOT%{_mingw_bindir} - # .dll.a file is misnamed for some reason - fix that. mv $RPM_BUILD_ROOT%{_mingw_libdir}/libzdll.a \ $RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll.a @@ -80,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT %{_mingw_includedir}/zconf.h %{_mingw_includedir}/zlib.h %{_mingw_libdir}/libz.dll.a -%{_mingw_bindir}/libz.dll +%{_mingw_bindir}/zlib1.dll %{_mingw_mandir}/man3/zlib.3 diff --git a/zlib/zlib-win32.patch b/zlib/zlib-win32.patch index 85c1bad..23beea6 100644 --- a/zlib/zlib-win32.patch +++ b/zlib/zlib-win32.patch @@ -35,7 +35,7 @@ diff -rup zlib-1.2.3.orig/win32/Makefile.gcc zlib-1.2.3.new/win32/Makefile.gcc -$(INSTALL) zconf.h $(INCLUDE_PATH) -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH) -$(INSTALL) $(IMPLIB) $(LIBRARY_PATH) -+ -$(INSTALL) $(SHAREDLIB) $(LIBRARY_PATH)/libz.dll ++ -$(INSTALL) $(SHAREDLIB) $(BINARY_PATH) uninstall: -$(RM) $(INCLUDE_PATH)/zlib.h