X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=zlib%2Fmingw-zlib.spec;h=31c032ee2a77507c4056636b203f6d0e6d9c47da;hb=9c63cf8331a30d6eab6de4db28c939005bf9820a;hp=3874cb289299d287585d5d371fb3d6ec64b53988;hpb=f851b14216127f995b159c3d31586362a2c16300;p=fedora-mingw.git

diff --git a/zlib/mingw-zlib.spec b/zlib/mingw-zlib.spec
index 3874cb2..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:        6%{?dist}
+Release:        8%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -13,7 +18,7 @@ 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
 
@@ -50,17 +55,13 @@ 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 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
@@ -68,8 +69,6 @@ mv $RPM_BUILD_ROOT%{_mingw_libdir}/libzdll.a \
 # Remove static library.
 rm $RPM_BUILD_ROOT%{_mingw_libdir}/libz.a
 
-%__install zlib.3 $RPM_BUILD_ROOT%{_mingw_mandir}/man3
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,12 +79,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw_includedir}/zconf.h
 %{_mingw_includedir}/zlib.h
 %{_mingw_libdir}/libz.dll.a
-%{_mingw_bindir}/libz.dll
-%{_mingw_mandir}/man3/zlib.3
+%{_mingw_bindir}/zlib1.dll
 
 
 %changelog
-* Wed Sep 10 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.3-6
+* 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