X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=zlib%2Fmingw-zlib.spec;h=ff5aa6b7056613dbaf60a7aa9f3b531fe286b639;hb=134aaf17e322e408aff3fc6a43bb13e635141fdd;hp=bbca2dd509e775ff91cc07c2ddec22270d46d6c8;hpb=93c1d376120066437a9c6b5d1d5d8517d16bfb4a;p=fedora-mingw.git

diff --git a/zlib/mingw-zlib.spec b/zlib/mingw-zlib.spec
index bbca2dd..ff5aa6b 100644
--- a/zlib/mingw-zlib.spec
+++ b/zlib/mingw-zlib.spec
@@ -1,19 +1,23 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+%include /usr/lib/rpm/mingw-defs
 
 Name:           mingw-zlib
 Version:        1.2.3
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
 Group:          Development/Libraries
 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
 
 %description
@@ -22,19 +26,41 @@ MinGW Windows zlib compression library.
 
 %prep
 %setup -q -n zlib-1.2.3
+%patch1 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" \
-CC=i686-pc-mingw32-gcc RANLIB=i686-pc-mingw32-ranlib ./configure
+CC=%{_mingw_cc} \
+CFLAGS="%{_mingw_cflags}" \
+RANLIB=%{_mingw_ranlib} \
+./configure
 
-make all
+make -f win32/Makefile.gcc \
+  CC=%{_mingw_cc} \
+  AR=%{_mingw_ar} \
+  RC=i686-pc-mingw32-windres \
+  DLLWRAP=i686-pc-mingw32-dllwrap \
+  STRIP=%{_mingw_strip} \
+  all
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make prefix=$RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw install
+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} \
+     install
+
+# DLL needs to do in the bin directory.
+mv $RPM_BUILD_ROOT%{_mingw_libdir}/libz.dll $RPM_BUILD_ROOT%{_mingw_bindir}
+
+%__install zlib.3 $RPM_BUILD_ROOT%{_mingw_mandir}/man3
 
 
 %clean
@@ -43,11 +69,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/*
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/*
+%{_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
 
 
 %changelog
-* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-5
+* 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.