- filer out compiler options not supported by mingw

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

diff --git a/crossmingw32-expat.spec b/crossmingw32-expat.spec
index 068452af4cc00d20e2803f2164b08da460605304..b83d4e1db4381b8a732c20fb5134c9bf993e3857 100644 (file)
--- a/crossmingw32-expat.spec
+++ b/crossmingw32-expat.spec
@@ -1,15 +1,15 @@
 Summary:       XML 1.0 parser - Ming32 cross version
 Summary(pl.UTF-8):     Analizator składni XML-a 1.0 - wersja skrośna dla Ming32
-%define                _realname               expat
-Name:          crossmingw32-%{_realname}
-Version:       2.0.0
-Release:       1
+%define                realname                expat
+Name:          crossmingw32-%{realname}
+Version:       2.0.1
+Release:       4
 License:       Thai Open Source Software Center Ltd (distributable)
 Group:         Development/Libraries
-Source0:       http://dl.sourceforge.net/expat/%{_realname}-%{version}.tar.gz
-# Source0-md5: d945df7f1c0868c5c73cf66ba9596f3f
-Patch0:                %{_realname}-ac_fixes.patch
-Patch1:                %{_realname}-soname.patch
+Source0:       http://dl.sourceforge.net/expat/%{realname}-%{version}.tar.gz
+# Source0-md5: ee8b492592568805593f81f8cdf2a04c
+Patch0:                %{realname}-ac_fixes.patch
+Patch1:                %{realname}-soname.patch
 URL:           http://expat.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -22,18 +22,22 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                target                  i386-mingw32
 %define                target_platform         i386-pc-mingw32
-%define                arch                    %{_prefix}/%{target}
 
 %define                _sysprefix              /usr
 %define                _prefix                 %{_sysprefix}/%{target}
+%define                _libdir                 %{_prefix}/lib
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
 
-%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
+# -z options are invalid for mingw linker
+%define                filterout_ld    -Wl,-z,.*
+%define                filterout_c     -f[-a-z0-9=]*
+%define                filterout_cxx   -f[-a-z0-9=]*
 
 %description
 Expat is an XML parser written in C. It aims to be fully conforming.
@@ -73,7 +77,7 @@ DLL expat library for Windows.
 Biblioteka DLL expat dla Windows.
 
 %prep
-%setup -q -n %{_realname}-%{version}
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
 
@@ -85,12 +89,12 @@ Biblioteka DLL expat dla Windows.
        --target=%{target} \
        --host=%{target}
 
-%{__make}
+%{__make} buildlib
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} installlib \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}