- updated to 2.9.8

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

diff --git a/crossmingw32-libxml2.spec b/crossmingw32-libxml2.spec
index 36ca8f5fad2f31bb7bb03c1862f7b2870766d293..ac7f04cafd23c57e0c49fdbc55fe07a38e749dd5 100644 (file)
--- a/crossmingw32-libxml2.spec
+++ b/crossmingw32-libxml2.spec
@@ -2,24 +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.8.0
+Version:       2.9.8
 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: c62106f02ee00b6437f0fb9d370c1093
+# Source0-md5: b786e353e2aa1b872d70d5d1ca0c740d
 Patch0:                %{realname}-man_fixes.patch
 Patch1:                %{realname}-open.gz.patch
 Patch2:                %{realname}-largefile.patch
 URL:           http://xmlsoft.org/
-BuildRequires: autoconf >= 2.59
+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
@@ -34,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.
@@ -63,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
@@ -83,6 +95,8 @@ Biblioteka DLL libxml2 dla Windows.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+# MinGW32 headers don't define this
+CPPFLAGS="%{rpmcppflags} -D_WINSOCKAPI_"
 %configure \
        --target=%{target} \
        --host=%{target} \
@@ -98,13 +112,16 @@ rm -rf $RPM_BUILD_ROOT
        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
 %{target}-strip -g -R.comment -R.note $RPM_BUILD_ROOT%{_libdir}/*.a
 %endif
 
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{*.exe,xml2-config}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/xml2Conf.sh
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/cmake
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,doc,gtk-doc,man}
 
 %clean