X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=zlib%2Fmingw-zlib.spec;h=31c032ee2a77507c4056636b203f6d0e6d9c47da;hb=25c5229e6b61c2b1dd59b6b72b8a92615a67773d;hp=3bcd361e0fd6955d4cc9ba1c33714175727de261;hpb=ba1846e3d99f1255f62150c6f4ce5a3560c3a3bf;p=fedora-mingw.git

diff --git a/zlib/mingw-zlib.spec b/zlib/mingw-zlib.spec
index 3bcd361..31c032e 100644
--- a/zlib/mingw-zlib.spec
+++ b/zlib/mingw-zlib.spec
@@ -1,8 +1,13 @@
-%include /usr/lib/rpm/mingw-defs
+
+%define __strip %{_mingw_strip}
+%define __objdump %{_mingw_objdump}
+%define _use_internal_dependency_generator 0
+%define __find_requires %{_mingw_findrequires}
+%define __find_provides %{_mingw_findprovides}
 
 Name:           mingw-zlib
 Version:        1.2.3
-Release:        3%{?dist}
+Release:        8%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -11,13 +16,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-filesystem >= 23
 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.
@@ -49,17 +55,19 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_mingw_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_mingw_libdir}
-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
 
-%__install zlib.3 $RPM_BUILD_ROOT%{_mingw_mandir}/man3
+# Remove static library.
+rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
 
 
 %clean
@@ -70,12 +78,20 @@ 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_mandir}/man3/zlib.3
+%{_mingw_libdir}/libz.dll.a
+%{_mingw_bindir}/zlib1.dll
 
 
 %changelog
+* Sun Sep 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-8
+- Remove manpage.
+
+* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-7
+- 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.