X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=zlib%2Fmingw-zlib.spec;h=9d343509e97f8d6d12352fe887c1b6a5aeced240;hb=b22fd5e5937abd6ebb4ad4af8ae67280948527bb;hp=416bac6c1e318822a178788bedabb34541cf920a;hpb=3fe1acf6b4cedee45f2d944707a68aea1c51f0d8;p=fedora-mingw.git

diff --git a/zlib/mingw-zlib.spec b/zlib/mingw-zlib.spec
index 416bac6..9d34350 100644
--- a/zlib/mingw-zlib.spec
+++ b/zlib/mingw-zlib.spec
@@ -1,8 +1,13 @@
-%define __os_install_post /usr/lib/rpm/brp-compress %{nil}
+
+%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:        1%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW Windows zlib compression library
 
 License:        zlib
@@ -11,11 +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 >= 23
 BuildRequires:  mingw-gcc
 BuildRequires:  mingw-binutils
 
-Requires:       mingw-runtime
+# For some reason mingw-find-provides doesn't get this.
+Provides:       mingw(zlib1.dll)
 
 %description
 MinGW Windows zlib compression library.
@@ -25,28 +33,44 @@ MinGW Windows zlib compression library.
 %setup -q -n zlib-1.2.3
 %patch1 -p1
 
+
 %build
-CFLAGS="-O2 -g -pipe -Wall" \
-CC=i686-pc-mingw32-gcc RANLIB=i686-pc-mingw32-ranlib ./configure
+CC=%{_mingw_cc} \
+CFLAGS="%{_mingw_cflags}" \
+RANLIB=%{_mingw_ranlib} \
+./configure
 
 make -f win32/Makefile.gcc \
-  CC=i686-pc-mingw32-gcc \
-  AR=i686-pc-mingw32-ar \
+  CC=%{_mingw_cc} \
+  AR=%{_mingw_ar} \
   RC=i686-pc-mingw32-windres \
   DLLWRAP=i686-pc-mingw32-dllwrap \
-  STRIP=i686-pc-mingw32-strip \
+  STRIP=%{_mingw_strip} \
   all
 
+
 %install
 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%{_prefix}/i686-pc-mingw32/sys-root/mingw/include \
-     LIBRARY_PATH=$RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib \
+     INCLUDE_PATH=$RPM_BUILD_ROOT%{_mingw_includedir} \
+     LIBRARY_PATH=$RPM_BUILD_ROOT%{_mingw_libdir} \
+     BINARY_PATH=$RPM_BUILD_ROOT%{_mingw_bindir} \
      install
 
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3
-%__install zlib.3  $RPM_BUILD_ROOT%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3
+# .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
 
 
 %clean
@@ -55,14 +79,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/zconf.h
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/include/zlib.h
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libz.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libzdll.a
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/lib/libz.dll
-%{_prefix}/i686-pc-mingw32/sys-root/mingw/share/man/man3/zlib.3
+%{_mingw_includedir}/zconf.h
+%{_mingw_includedir}/zlib.h
+%{_mingw_libdir}/libz.dll.a
+%{_mingw_bindir}/zlib1.dll
+%{_mingw_mandir}/man3/zlib.3
 
 
 %changelog
-* Mon Jul  7 2008 Richard W.M. Jones <rjones@redhat.com> - 2.18.50_20080109_2-5
+* 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.