X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libxslt%2Fmingw32-libxslt.spec;h=f6f70bf606aa9344ab8d467eb843bc51a637b84d;hb=HEAD;hp=de8e65d907694a18f2fe567aa2240186ce418d72;hpb=6b58f8ea8aead336c0f260695af563f468561206;p=fedora-mingw.git

diff --git a/libxslt/mingw32-libxslt.spec b/libxslt/mingw32-libxslt.spec
index de8e65d..f6f70bf 100644
--- a/libxslt/mingw32-libxslt.spec
+++ b/libxslt/mingw32-libxslt.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw32-libxslt
 Version:        1.1.24
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        MinGW Windows Library providing the Gnome XSLT engine
 
 License:        MIT
@@ -25,9 +25,15 @@ 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
+BuildRequires:  autoconf, automake, libtool
 
 Requires:       mingw32-libxml2 >= 2.7.2-3
+Requires:       pkgconfig
 
 
 %description
@@ -44,10 +50,14 @@ 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
-make
+make %{?_smp_mflags}
 gzip -9 ChangeLog
 
 
@@ -56,6 +66,7 @@ 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
 
@@ -70,6 +81,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%doc COPYING
 %{_mingw32_bindir}/xslt-config
 %{_mingw32_bindir}/xsltproc.exe
 %{_mingw32_includedir}/libexslt
@@ -87,5 +99,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Oct 25 2008 Richard W.M. Jones <rjones@redhat.com> - 1.1.24-1
+* Fri Feb 20 2009 Richard W.M. Jones <rjones@redhat.com> - 1.1.24-5
+- Rebuild for mingw32-gcc 4.4
+
+* Fri Feb  6 2009 Richard W.M. Jones <rjones@redhat.com> - 1.1.24-4
+- Include license file.
+
+* Fri Jan 23 2009 Richard W.M. Jones <rjones@redhat.com> - 1.1.24-3
+- 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.