Requires pkgconfig (Erik van Pienbroek).

[fedora-mingw.git] / libxslt / mingw32-libxslt.spec

diff --git a/libxslt/mingw32-libxslt.spec b/libxslt/mingw32-libxslt.spec
index 67e105e..331bbf4 100644 (file)
--- a/libxslt/mingw32-libxslt.spec
+++ b/libxslt/mingw32-libxslt.spec
@@ -25,6 +25,8 @@ Patch1000:      mingw32-libxslt-1.1.24-win32-shared.patch
 BuildRequires:  mingw32-filesystem >= 30
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
+BuildRequires:  mingw32-dlfcn
+BuildRequires:  mingw32-iconv
 BuildRequires:  mingw32-libgcrypt
 BuildRequires:  mingw32-libxml2 >= 2.7.2-3
 BuildRequires:  pkgconfig
@@ -48,10 +50,13 @@ installed. The xsltproc command is a command line interface to the XSLT engine
 
 %patch1000 -p1
 
+libtoolize --force --copy
+autoreconf
+
 
 %build
 PATH=%{_mingw32_bindir}:$PATH \
-%{_mingw32_configure} --without-python --enable-shared --disable-static
+%{_mingw32_configure} --without-python --enable-shared
 make %{?_smp_mflags}
 gzip -9 ChangeLog
 
@@ -60,6 +65,11 @@ gzip -9 ChangeLog
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# Remove static libraries but DON'T remove *.dll.a files.
+# Note that ./configure --disable-static doesn't work.
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libexslt.a
+rm $RPM_BUILD_ROOT%{_mingw32_libdir}/libxslt.a
+
 # Remove doc and man which duplicate stuff already in Fedora native package.
 rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}
 rm -r $RPM_BUILD_ROOT%{_mingw32_mandir}
@@ -89,8 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.1.24-3
-- Disable static libraries.
 - Use _smp_mflags.
+- Rebuild libtool.
+- +BRs dlfcn and iconv.
 
 * Sat Oct 25 2008 Richard W.M. Jones <rjones@redhat.com> - 1.1.24-2
 - Initial RPM release.