do not provide pkgconfig deps in system namespace

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

diff --git a/crossmingw32-libxml2.spec b/crossmingw32-libxml2.spec
index 94875f96e2560f1a62e15dba68881bab3c02456e..a7592ff76677230ab8c710379313c08f58977952 100644 (file)
--- a/crossmingw32-libxml2.spec
+++ b/crossmingw32-libxml2.spec
@@ -2,24 +2,22 @@
 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.8
-Release:       1
+Version:       2.9.0
+Release:       2
 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: 8127a65e8c3b08856093099b52599c86
-Patch0:                %{realname}-amfix.patch
-Patch1:                %{realname}-man_fixes.patch
-Patch2:                %{realname}-open.gz.patch
-Patch3:                %{realname}-largefile.patch
-Patch4:                %{realname}-version-script.patch
+# Source0-md5: 5b9bebf4f5d2200ae2c4efe8fa6103f7
+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: libtool >= 2:2.0
 BuildRequires: sed >= 4.0
 Requires:      crossmingw32-zlib >= 1.2.4-3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,7 +34,15 @@ 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}
+
+%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.
@@ -78,8 +84,6 @@ Biblioteka DLL libxml2 dla Windows.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -90,6 +94,7 @@ Biblioteka DLL libxml2 dla Windows.
 %configure \
        --target=%{target} \
        --host=%{target} \
+       --disable-silent-rules \
        --without-python
 
 %{__make}
@@ -108,7 +113,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