X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=crossmingw32-expat.spec;h=d519fa23007403e502a07602eb1ba199a6b511ce;hb=96485b716408177b1be5e1c84059be1b8a5d5d3c;hp=1c9ec9afa4c24cd8e034d4c119c4bca9d9dd4c96;hpb=b3b05d57b0cb35ee1b903e61689f365826b9476c;p=packages%2Fcrossmingw32-expat.git

diff --git a/crossmingw32-expat.spec b/crossmingw32-expat.spec
index 1c9ec9a..d519fa2 100644
--- a/crossmingw32-expat.spec
+++ b/crossmingw32-expat.spec
@@ -1,59 +1,78 @@
+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
-Summary:	XML 1.0 parser
-Summary(pl):	Analizator sk³adni XML 1.0
-Summary(pt_BR):	Biblioteca XML expat
-Summary(ru):	ðÅÒÅÎÏÓÉÍÁÑ ÂÉÂÌÉÏÔÅËÁ ÒÁÚÂÏÒÁ XML (expat)
-Summary(uk):	ðÅÒÅÎÏÓÉÍÁ ¦Â̦ÏÔÅËÁ ÒÏÚÂÏÒÕ XML (expat)
 Name:		crossmingw32-%{realname}
-Version:	1.95.7
-Release:	1
+Version:	2.0.1
+Release:	3
 License:	Thai Open Source Software Center Ltd (distributable)
-Group:		Applications/Publishing/XML
+Group:		Development/Libraries
 Source0:	http://dl.sourceforge.net/expat/%{realname}-%{version}.tar.gz
-# Source0-md5:	2ff59c2a5cbdd21a285c5f343e214fa9
-Patch0:		%{realname}-DESTDIR.patch
-Patch1:		%{realname}-ac_fixes.patch
+# Source0-md5:	ee8b492592568805593f81f8cdf2a04c
+Patch0:		%{realname}-ac_fixes.patch
+Patch1:		%{realname}-soname.patch
 URL:		http://expat.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	crossmingw32-gcc
 BuildRequires:	libtool
 Requires:	crossmingw32-runtime
-BuildRoot:	%{tmpdir}/%{realname}-%{version}-root-%(id -u -n)
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		no_install_post_strip	1
 
 %define		target			i386-mingw32
 %define		target_platform 	i386-pc-mingw32
+
 %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++
 
+%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,.*
+
 %description
 Expat is an XML parser written in C. It aims to be fully conforming.
 It is currently not a validating XML parser.
 
-%description -l pl
-Expat to napisany w jêzyku C analizator sk³adni XML. D±¿y do pe³nej
-zgodno¶ci ze specyfikacj±. Aktualnie nie jest analizatorem, który
-potwiedza³by zgodno¶æ ze specyfikacj±.
+This package contains the cross version for Win32.
+
+%description -l pl.UTF-8
+Expat to napisany w języku C analizator składni XML-a. Dąży do pełnej
+zgodności ze specyfikacją. Aktualnie nie jest analizatorem, który
+potwiedzał by zgodność ze specyfikacją.
+
+Ten pakiet zawiera wersję skrośną dla Win32.
+
+%package static
+Summary:	Static expat library (cross mingw32 version)
+Summary(pl.UTF-8):	Statyczna biblioteka expat (wersja skrośna mingw32)
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description static
+Static expat library (cross mingw32 version).
+
+%description static -l pl.UTF-8
+Statyczna biblioteka expat (wersja skrośna mingw32).
 
-%description -l pt_BR
-Esta é a biblioteca, em C, XML expat, de James Clark. É um analisador
-orientado a fluxo de informações que pede o uso de handlers para lidar
-com a estrutura que o analisador encontrar no documento.
+%package dll
+Summary:	DLL expat library for Windows
+Summary(pl.UTF-8):	Biblioteka DLL expat dla Windows
+Group:		Applications/Emulators
+Requires:	wine
 
-%description -l ru
-Expat -- ÐÁÒÓÅÒ XML 1.0, ÎÁÐÉÓÁÎÎÙÊ ÎÁ C. ïÎ ÐÒÅÄÎÁÚÎÁÞÅÎ ÄÌÑ ÔÏÇÏ,
-ÞÔÏÂÙ ÂÙÔØ ÐÏÌÎÏÓÔØÀ ÓÏ×ÍÅÓÔÉÍÙÍ. ÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÜÔÏ ÎÅ ÐÒÏ×ÅÒÑÀÝÉÊ
-("not a validating") XML ÐÁÒÓÅÒ.
+%description dll
+DLL expat library for Windows.
 
-%description -l uk
-Expat -- ÐÁÒÓÅÒ XML 1.0, ÎÁÐÉÓÁÎÉÊ ÎÁ C. òÏÚÒÁÈÏ×ÁÎÉÊ ÎÁ ÔÅ, ÝÏ ÂÕÔÉ
-ÐÏ×ΦÓÔÀ ÓÕͦÓÎÉÍ. îÁÒÁÚ¦ ÃÅ ÎÅ ÐÅÒÅצÒÑÀÞÉÊ ("not a validating") XML
-ÐÁÒÓÅÒ.
+%description dll -l pl.UTF-8
+Biblioteka DLL expat dla Windows.
 
 %prep
 %setup -q -n %{realname}-%{version}
@@ -66,22 +85,39 @@ Expat -- 
 %{__autoconf}
 %configure \
 	--target=%{target} \
-	--host=%{target_platform} \
-	--disable-static
-%{__make}
+	--host=%{target}
+
+%{__make} buildlib
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} installlib \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_dlldir}
+mv -f $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
+%{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)
-%attr(755,root,root) %{_bindir}/libexpat-0.dll
 %{_libdir}/libexpat.dll.a
 %{_libdir}/libexpat.la
-%{_includedir}/expat.h
+%{_includedir}/expat*.h
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libexpat.a
+
+%files dll
+%defattr(644,root,root,755)
+%{_dlldir}/libexpat-0.dll