- unified MinGW32 caps

[packages/crossmingw32-w32api.git] / crossmingw32-w32api.spec

diff --git a/crossmingw32-w32api.spec b/crossmingw32-w32api.spec
index 201726199cc6d9d4678b21197ffd8e002709e06e..7b6d2d6ab251714cc3ed35b032af526e64e956ef 100644 (file)
--- a/crossmingw32-w32api.spec
+++ b/crossmingw32-w32api.spec
@@ -1,23 +1,24 @@
-Summary:       Mingw32 Binary Utility Development Utilities - Win32 API libraries
-Summary(pl.UTF-8):     Zestaw narzędzi mingw32 - biblioteki API Win32
+Summary:       MinGW32 Binary Utility Development Utilities - Win32 API libraries
+Summary(pl.UTF-8):     Zestaw narzędzi MinGW32 - biblioteki API Win32
 Name:          crossmingw32-w32api
-Version:       3.7
+Version:       3.14
 %define        apiver  %{version}
-%define        apisrc  w32api-%{apiver}
-%define runver 3.10
-%define        runsrc  mingw-runtime-%{runver}
-Release:       2
+%define        apisrc  w32api-%{apiver}-mingw32
+%define runver 3.18
+%define        runsrc  mingwrt-%{runver}-mingw32
+Release:       1
 Epoch:         1
 License:       Free
 Group:         Development/Libraries
-Source0:       http://dl.sourceforge.net/mingw/%{apisrc}-src.tar.gz
-# Source0-md5: d799c407b4c1b480d0339994d01f355d
+Source0:       http://downloads.sourceforge.net/mingw/%{apisrc}-src.tar.gz
+# Source0-md5: c31baedaf2a8d38874e056a112a4fbc8
 # only for headers
-Source1:       http://dl.sourceforge.net/mingw/%{runsrc}-src.tar.gz
-# Source1-md5: 9225684e663eafa900b4075731c25f4c
-Source2:       http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource2-md5:       0c40bd4545aa630e139043c2b12f0807
+Source1:       http://downloads.sourceforge.net/mingw/%{runsrc}-src.tar.gz
+# Source1-md5: 34b54cb3379f871f0dcd5c20b69b0350
+Source2:       http://www.opengl.org/registry/api/glext.h
+# NoSource2-md5:       f7933dfbc98bb0408cf3ec805cb82640
 Patch0:                %{name}-include_fix.patch
+Patch1:                %{name}-mmsystem.patch
 URL:           http://www.mingw.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -34,15 +35,15 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # strip fails on static COFF files
 %define                no_install_post_strip 1
 
-%ifarch alpha sparc sparc64 sparcv9
-# alpha's -mieee and sparc's -mtune=* are not valid for target's gcc
+%ifnarch %{ix86}
+# arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
 %define                optflags        -O2
 %endif
 
 %description
 crossmingw32 is a complete cross-compiling development system for
 building stand-alone Microsoft Windows applications under Linux using
-the Mingw32 build libraries. This includes a binutils, gcc with g++
+the MinGW32 build libraries. This includes a binutils, gcc with g++
 and objc, and libstdc++, all cross targeted to i386-mingw32, along
 with supporting Win32 libraries in 'coff' format from free sources.
 
@@ -51,7 +52,7 @@ This package contains Win32 API includes and libraries.
 %description -l pl.UTF-8
 crossmingw32 jest kompletnym systemem do kompilacji skrośnej,
 pozwalającym budować aplikacje MS Windows pod Linuksem używając
-bibliotek mingw32. System składa się z binutils, gcc z g++ i objc,
+bibliotek MinGW32. System składa się z binutils, gcc z g++ i objc,
 libstdc++ - wszystkie generujące kod dla platformy i386-mingw32, oraz
 z bibliotek w formacie COFF.
 
@@ -62,6 +63,8 @@ Summary:      DirectX from MinGW Win32 API
 Summary(pl.UTF-8):     DirectX z API Win32 dla MinGW
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      crossmingw32-dx
+Obsoletes:     crossmingw32-dx
 
 %description dx
 DirectX from MinGW Win32 API.
@@ -70,8 +73,9 @@ DirectX from MinGW Win32 API.
 DirectX z API Win32 dla MinGW.
 
 %prep
-%setup -q -n w32api-%{version} -a1
+%setup -q -n w32api-%{version}-mingw32 -a1
 %patch0 -p1
+%patch1 -p1
 
 %build
 cp /usr/share/automake/config.sub .
@@ -88,8 +92,9 @@ cp /usr/share/automake/config.sub .
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       inst_libdir=$RPM_BUILD_ROOT%{_libdir} \
-       inst_includedir=$RPM_BUILD_ROOT%{_includedir}
+       libdir=$RPM_BUILD_ROOT%{_libdir} \
+       includedir=$RPM_BUILD_ROOT%{_includedir}
+
 
 %{!?debug:%{target}-strip -g $RPM_BUILD_ROOT%{_libdir}/*.a}
 
@@ -101,19 +106,53 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %dir %{_includedir}
-%{_includedir}/*
+%{_includedir}/[!d]*.h
+%{_includedir}/dbt.h
+%{_includedir}/dde.h
+%{_includedir}/ddeml.h
+%{_includedir}/devguid.h
+%{_includedir}/dhcpcsdk.h
+%{_includedir}/dlgs.h
+%{_includedir}/docobj.h
+%{_includedir}/dsadmin.h
+%{_includedir}/dsclient.h
+%{_includedir}/dsgetdc.h
+%{_includedir}/dsquery.h
+%{_includedir}/dsrole.h
+%{_includedir}/dvdevcod.h
+%{_includedir}/dvdmedia.h
+%{_includedir}/GL
+%{_includedir}/ddk
 %{_libdir}/lib[!d]*.a
+%{_libdir}/libdhcpcsvc.a
 %{_libdir}/libdlcapi.a
+%{_libdir}/libdnsapi.a
 %{_libdir}/libdxapi.a
-%exclude %{_libdir}/libglut*.a
-%exclude %{_includedir}/dxerr*.h
-%exclude %{_includedir}/d3d*.h
 
 %files dx
 %defattr(644,root,root,755)
-%{_libdir}/libd[!lx]*.a
-%{_libdir}/libdxguid.a
+%{_libdir}/libd3d8.a
+%{_libdir}/libd3d9.a
+%{_libdir}/libd3dim.a
+%{_libdir}/libd3drm.a
+%{_libdir}/libd3dx8d.a
+%{_libdir}/libd3dx9d.a
+%{_libdir}/libd3dxof.a
+%{_libdir}/libddraw.a
+%{_libdir}/libdinput.a
+%{_libdir}/libdinput8.a
+%{_libdir}/libdmoguids.a
+%{_libdir}/libdplayx.a
+%{_libdir}/libdpnaddr.a
+%{_libdir}/libdpnet.a
+%{_libdir}/libdpnlobby.a
+%{_libdir}/libdpvoice.a
+%{_libdir}/libdsetup.a
+%{_libdir}/libdsound.a
 %{_libdir}/libdxerr8.a
 %{_libdir}/libdxerr9.a
-%{_includedir}/dxerr*.h
-%{_includedir}/d3d*.h
+%{_libdir}/libdxguid.a
+%{_includedir}/d3d9*.h
+%{_includedir}/dshow.h
+%{_includedir}/dxerr8.h
+%{_includedir}/dxerr9.h