X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-expat.spec;h=06515b7f3120b28248c3bb5a1427807fe6279178;hb=2a22138002e5a43ab95dd9728f9b740da172f842;hp=b83d4e1db4381b8a732c20fb5134c9bf993e3857;hpb=92f2a7f5b21be755b08987cd606f4deff6374b9b;p=packages%2Fcrossmingw32-expat.git

diff --git a/crossmingw32-expat.spec b/crossmingw32-expat.spec
index b83d4e1..06515b7 100644
--- a/crossmingw32-expat.spec
+++ b/crossmingw32-expat.spec
@@ -2,23 +2,25 @@ 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
-Release:	4
-License:	Thai Open Source Software Center Ltd (distributable)
+Version:	2.6.2
+Release:	1
+License:	MIT
 Group:		Development/Libraries
-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
+Source0:	https://downloads.sourceforge.net/expat/%{realname}-%{version}.tar.xz
+# Source0-md5:	0cb75c8feb842c0794ba89666b762a2d
+URL:		http://www.libexpat.org/
+BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
-BuildRequires:	crossmingw32-gcc
-BuildRequires:	libtool
+BuildRequires:	crossmingw32-gcc >= 1:3.2
+BuildRequires:	libtool >= 2:2.4
+BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 Requires:	crossmingw32-runtime
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
+%define		_enable_debug_packages	0
 
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
@@ -26,9 +28,12 @@ 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}
 
 %ifnarch %{ix86}
 # arch-specific flags (like alpha's -mieee) are not valid for i386 gcc
@@ -78,43 +83,50 @@ Biblioteka DLL expat dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
+# remove SIZEOF_VOID_P define, see buildconf.sh
+%{__sed} -i -e '/^\/\* The size of `void \*/,/^$/ d' expat_config.h.in
 %configure \
+	--build=i686-pc-linux-gnu \
+	--host=%{target} \
 	--target=%{target} \
-	--host=%{target}
+	--without-docbook \
+	--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}
+
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/cmake
 
 %if 0%{!?debug:1}
 %{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_dlldir}/*.dll
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/man
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc AUTHORS COPYING Changes README.md
 %{_libdir}/libexpat.dll.a
 %{_libdir}/libexpat.la
 %{_includedir}/expat*.h
+%{_pkgconfigdir}/expat.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -122,4 +134,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dll
 %defattr(644,root,root,755)
-%{_dlldir}/libexpat-0.dll
+%{_dlldir}/libexpat-1.dll