X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libxml2%2Fmingw32-libxml2.spec;h=f9b2e0c671e2da4b412452113feb72113934eaf7;hb=a3bc98bdd189f2437224a0bca0bbf66942d39475;hp=0fc3ae35dea0c146cebfc4f7e39d6139de3b7b77;hpb=2a40552003a3d88b23b45739eafd1d8dc7781488;p=fedora-mingw.git

diff --git a/libxml2/mingw32-libxml2.spec b/libxml2/mingw32-libxml2.spec
index 0fc3ae3..f9b2e0c 100644
--- a/libxml2/mingw32-libxml2.spec
+++ b/libxml2/mingw32-libxml2.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libxml2
 Version:        2.7.2
-Release:        1%{?dist}
+Release:        6%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        MIT
@@ -18,13 +18,23 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Not required for MinGW.
 #Patch0:         libxml2-multilib.patch
 
+# MinGW-specific patches.
+Patch1000:      mingw32-libxml2-2.7.2-with-modules.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 23
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
-BuildRequires:  mingw32-zlib
+
+BuildRequires:  mingw32-dlfcn
 BuildRequires:  mingw32-gettext
+BuildRequires:  mingw32-iconv
+BuildRequires:  mingw32-zlib
+
+BuildRequires:  autoconf, automake, libtool
+
+Requires:       pkgconfig
 
 
 %description
@@ -34,10 +44,17 @@ MinGW Windows libxml2 XML processing library.
 %prep
 %setup -q -n libxml2-%{version}
 
+%patch1000 -p1
+
+# Patched configure.in, so rebuild configure.
+libtoolize --force --copy
+autoreconf
+
 
 %build
-LDFLAGS="-no-undefined" %{_mingw32_configure} --without-python
-make
+LDFLAGS="-no-undefined" \
+%{_mingw32_configure} --without-python --with-modules --disable-static
+make %{?_smp_mflags}
 
 
 %install
@@ -45,8 +62,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
-rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libxml2.a
-
 # Remove manpages which duplicate Fedora native.
 rm -rf $RPM_BUILD_ROOT%{_mingw32_mandir}
 
@@ -73,6 +88,21 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 26 2009 Richard W.M. Jones <rjones@redhat.com> - 2.7.2-6
+- Rerun autoreconf after patching configure.in (Erik van Pienbroek).
+- Rebuild libtool for Rawhide / libtool 2.
+- Add BRs dlfcn and iconv.
+
+* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 2.7.2-5
+- Use _smp_mflags.
+- Disable static libraries.
+
+* Tue Jan 13 2009 Richard W.M. Jones <rjones@redhat.com> - 2.7.2-4
+- Requires pkgconfig.
+
+* Sat Oct 25 2008 Richard W.M. Jones <rjones@redhat.com> - 2.7.2-3
+- Enable modules support for libxslt.
+
 * Fri Oct 17 2008 Richard W.M. Jones <rjones@redhat.com> - 2.7.2-1
 - Resynch to native Fedora package + patch.