- destdir no longer needed; update ac_fixes

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

diff --git a/crossmingw32-expat.spec b/crossmingw32-expat.spec
index 189b28913adaf9d92a42b4c863999cffcced61d4..8f26a0900445c97302ff290a38098fb3609e910f 100644 (file)
--- a/crossmingw32-expat.spec
+++ b/crossmingw32-expat.spec
@@ -1,45 +1,53 @@
 %define                realname                expat
-Summary:       XML 1.0 parser
-Summary(pl):   Parser XML 1.0
+Summary:       XML 1.0 parser - Ming32 cross version
+Summary(pl):   Analizator sk³adni XML-a 1.0 - wersja skro¶na dla Ming32
 Summary(pt_BR):        Biblioteca XML expat
 Summary(ru):   ðÅÒÅÎÏÓÉÍÁÑ ÂÉÂÌÉÏÔÅËÁ ÒÁÚÂÏÒÁ XML (expat)
 Summary(uk):   ðÅÒÅÎÏÓÉÍÁ ¦Â̦ÏÔÅËÁ ÒÏÚÂÏÒÕ XML (expat)
 Name:          crossmingw32-%{realname}
-Version:       1.95.6
-Release:       4
-Epoch:         1
+Version:       1.95.8
+Release:       3
 License:       Thai Open Source Software Center Ltd (distributable)
 Group:         Applications/Publishing/XML
 Source0:       http://dl.sourceforge.net/expat/%{realname}-%{version}.tar.gz
-# Source0-md5: ca78d94e83e9f077b5da2bfe28ba986a
-Source1:       %{realname}.m4
+# Source0-md5: aff487543845a82fe262e6e2922b4c8e
 Patch0:                %{realname}-DESTDIR.patch
-Patch1:                %{realname}-gcc3-c++.patch
-Patch2:                %{realname}-ac_fixes.patch
+Patch1:                %{realname}-ac_fixes.patch
 URL:           http://expat.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: crossmingw32-gcc
 BuildRequires: libtool
-BuildRoot:     %{tmpdir}/%{realname}-%{version}-root-%(id -u -n)
-Obsoletes:     libexpat1_95
+Requires:      crossmingw32-runtime
+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                arch                    %{_prefix}/%{target}
-%define                gccarch                 %{_prefix}/lib/gcc-lib/%{target}
-%define                gcclib                  %{_prefix}/lib/gcc-lib/%{target}/%{version}
+%define                _sysprefix              /usr
+%define                _prefix                 %{_sysprefix}/%{target}
 
 %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
+%define                optflags        -O2
+%endif
+
 %description
 Expat is an XML parser written in C. It aims to be fully conforming.
 It is currently not a validating XML parser.
 
+This package contains the cross version for Win32.
+
 %description -l pl
-Expat to parser XML napisany w jêzyku C.
+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.
 
 %description -l pt_BR
 Esta é a biblioteca, em C, XML expat, de James Clark. É um analisador
@@ -60,29 +68,15 @@ Expat -- 
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
-CC=%{target}-gcc ; export CC
-CXX=%{target}-g++ ; export CXX
-LD=%{target}-ld ; export LD
-AR=%{target}-ar ; export AR
-AS=%{target}-as ; export AS
-CROSS_COMPILE=1 ; export CROSS_COMPILE
-CPPFLAGS="-I%{arch}/include" ; export CPPFLAGS
-RANLIB=%{target}-ranlib ; export RANLIB
-
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %configure \
        --target=%{target} \
        --host=%{target_platform} \
-       --prefix=%{arch} \
-       --disable-static \
-       --bindir=%{arch}/bin \
-       --libdir=%{arch}/lib \
-       --includedir=%{arch}/include
+       --disable-static
 %{__make}
 
 %install
@@ -91,11 +85,17 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_aclocaldir}
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_aclocaldir}
+%if 0%{!?debug:1}
+%{target}-strip --strip-unneeded -R.comment -R.note $RPM_BUILD_ROOT%{_bindir}/*.dll
+%{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%{arch}
+%defattr(644,root,root,755)
+%{_bindir}/libexpat-0.dll
+%{_libdir}/libexpat.dll.a
+%{_libdir}/libexpat.la
+%{_includedir}/expat*.h