X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-expat.spec;h=6aff6aba892d73fb3e63b2569857478fab81e43d;hb=ceccda6987a6e5eafc505c35fb32bad8f35b8ec6;hp=2d0501a195b0842efae4930d3653cd2590058c51;hpb=7181f99ed3622b587bc742959c5cba55e9d8c6c9;p=packages%2Fcrossmingw32-expat.git

diff --git a/crossmingw32-expat.spec b/crossmingw32-expat.spec
index 2d0501a..6aff6ab 100644
--- a/crossmingw32-expat.spec
+++ b/crossmingw32-expat.spec
@@ -2,16 +2,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.1
+Version:	2.2.5
 Release:	1
-License:	Thai Open Source Software Center Ltd (distributable)
+License:	MIT
 Group:		Development/Libraries
-Source0:	http://dl.sourceforge.net/expat/%{realname}-%{version}.tar.gz
-# Source0-md5:	ee8b492592568805593f81f8cdf2a04c
+Source0:	http://downloads.sourceforge.net/expat/%{realname}-%{version}.tar.bz2
+# Source0-md5:	789e297f547980fc9ecc036f9a070d49
 Patch0:		%{realname}-ac_fixes.patch
-Patch1:		%{realname}-soname.patch
-URL:		http://expat.sourceforge.net/
-BuildRequires:	autoconf
+URL:		http://www.libexpat.org/
+BuildRequires:	autoconf >= 2.58
 BuildRequires:	automake
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	libtool
@@ -26,14 +25,21 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		_sysprefix		/usr
 %define		_prefix			%{_sysprefix}/%{target}
 %define		_libdir			%{_prefix}/lib
+%define		_pkgconfigdir		%{_prefix}/lib/pkgconfig
 %define		_dlldir			/usr/share/wine/windows/system
 %define		__cc			%{target}-gcc
 %define		__cxx			%{target}-g++
+%define		__pkgconfig_provides	%{nil}
+%define		__pkgconfig_requires	%{nil}
 
-%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.
@@ -75,26 +81,28 @@ Biblioteka DLL expat dla Windows.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--target=%{target} \
-	--host=%{target}
+	--host=%{target} \
+	--without-xmlwf
 
-%{__make} buildlib
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} installlib \
+%{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_dlldir}
-mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
@@ -111,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libexpat.dll.a
 %{_libdir}/libexpat.la
 %{_includedir}/expat*.h
+%{_pkgconfigdir}/expat.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -118,4 +127,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libexpat-0.dll
+%{_dlldir}/libexpat-1.dll