- Need to run autoreconf after patching src/Makefile.am.

[fedora-mingw.git] / zlib / mingw-zlib.spec

diff --git a/zlib/mingw-zlib.spec b/zlib/mingw-zlib.spec
index 3bcd361..7ab1a94 100644 (file)
--- a/zlib/mingw-zlib.spec
+++ b/zlib/mingw-zlib.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-zlib
 Version:        1.2.3
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -11,13 +11,14 @@ URL:            http://www.zlib.net/
 Source0:        http://www.zlib.net/zlib-%{version}.tar.gz
 Patch1:         zlib-win32.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 BuildRequires:  mingw-filesystem >= 12
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 
-Requires:       mingw-filesystem >= 12
-Requires:       mingw-runtime
+# For some reason mingw-find-provides doesn't get this.
+Provides:       mingw(zlib1.dll)
 
 %description
 MinGW Windows zlib compression library.
@@ -54,10 +55,15 @@ 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 do 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
+
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
 
 %__install zlib.3 $RPM_BUILD_ROOT%{_mingw_mandir}/man3
 
@@ -70,12 +76,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_mingw_includedir}/zconf.h
 %{_mingw_includedir}/zlib.h
-%{_mingw_libdir}/libz.a
-%{_mingw_libdir}/libzdll.a
-%{_mingw_bindir}/libz.dll
+%{_mingw_libdir}/libz.dll.a
+%{_mingw_bindir}/zlib1.dll
 %{_mingw_mandir}/man3/zlib.3
 
 
 %changelog
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-6
+- Remove static library.
+
+* Fri Sep  5 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-5
+- Fix misnamed file: zlibdll.a -> zlib.dll.a
+- Explicitly provide mingw(zlib1.dll).
+
 * Thu Sep  4 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-3
 - Initial RPM release, largely based on earlier work from several sources.