- requires xz

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

diff --git a/crossmingw32-libxml2.spec b/crossmingw32-libxml2.spec
index 11d8c11e33c7c4a2e74f8b39e498c61264b06be5..3e741418deebc98dc797998ba70d559b1c2b6f06 100644 (file)
--- a/crossmingw32-libxml2.spec
+++ b/crossmingw32-libxml2.spec
@@ -2,25 +2,26 @@
 Summary:       libXML library - cross MinGW32 version
 Summary(pl.UTF-8):     Biblioteka libXML wersja 2 - wersja skrośna dla MinGW32
 Name:          crossmingw32-%{realname}
-Version:       2.7.7
+Version:       2.9.3
 Release:       1
 License:       MIT
 Group:         Development/Libraries
 #Source0:      http://ftp.gnome.org/pub/GNOME/sources/libxml2/2.6/%{name}-%{version}.tar.bz2
 Source0:       ftp://xmlsoft.org/libxml2/%{realname}-%{version}.tar.gz
-# Source0-md5: 9abc9959823ca9ff904f1fbcf21df066
-Patch0:                %{realname}-amfix.patch
-Patch1:                %{realname}-man_fixes.patch
-Patch2:                %{realname}-open.gz.patch
-Patch3:                %{realname}-largefile.patch
+# Source0-md5: daece17e045f1c107610e137ab50c179
+Patch0:                %{realname}-man_fixes.patch
+Patch1:                %{realname}-open.gz.patch
+Patch2:                %{realname}-largefile.patch
 URL:           http://xmlsoft.org/
-BuildRequires: autoconf >= 2.2
+BuildRequires: autoconf >= 2.68
 BuildRequires: automake >= 1.4
 BuildRequires: crossmingw32-gcc
 BuildRequires: crossmingw32-zlib >= 1.2.4-3
-BuildRequires: libtool >= 1:1.4.2-9
+BuildRequires: crossmingw32-xz
+BuildRequires: libtool >= 2:2.0
 BuildRequires: sed >= 4.0
 Requires:      crossmingw32-zlib >= 1.2.4-3
+Requires:      crossmingw32-xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                no_install_post_strip   1
@@ -35,7 +36,16 @@ BuildRoot:   %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _dlldir                 /usr/share/wine/windows/system
 %define                __cc                    %{target}-gcc
 %define                __cxx                   %{target}-g++
-%define                filterout_ld            -Wl,--as-needed -Wl,-z,relro -Wl,-z,combreloc
+%define                __pkgconfig_provides    %{nil}
+%define                __pkgconfig_requires    %{nil}
+
+%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, most of -f options are Linux-specific
+%define                filterout_ld    -Wl,--as-needed -Wl,-z,relro -Wl,-z,combreloc
+%define                filterout_c     -f[-a-z0-9=]*
 
 %description
 This library allows you to manipulate XML files.
@@ -64,6 +74,7 @@ Summary:      DLL libxml2 library for Windows
 Summary(pl.UTF-8):     Biblioteka DLL libxml2 dla Windows
 Group:         Applications/Emulators
 Requires:      crossmingw32-zlib-dll >= 1.2.4-3
+Requires:      crossmingw32-xz-dll
 Requires:      wine
 
 %description dll
@@ -77,7 +88,6 @@ Biblioteka DLL libxml2 dla Windows.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -88,6 +98,7 @@ Biblioteka DLL libxml2 dla Windows.
 %configure \
        --target=%{target} \
        --host=%{target} \
+       --disable-silent-rules \
        --without-python
 
 %{__make}
@@ -106,7 +117,7 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gtk-doc,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gtk-doc,man}
 
 %clean
 rm -rf $RPM_BUILD_ROOT