X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=nsis%2Fmingw32-nsis.spec;h=01b8ccf1f77ae9bf22d9417402e4b59775b3419f;hb=18e3be1f4401b0bf190ef41eb29d8a296d3db3c2;hp=1c98ecb6d2fa9ed6bc2bc8bd594522ac2b340c79;hpb=14bb5f7a7a8110b0c21eef08c532bd7f18c42e8e;p=fedora-mingw.git

diff --git a/nsis/mingw32-nsis.spec b/nsis/mingw32-nsis.spec
index 1c98ecb..01b8ccf 100644
--- a/nsis/mingw32-nsis.spec
+++ b/nsis/mingw32-nsis.spec
@@ -1,8 +1,9 @@
 %define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System DEBUG_SYMBOLS=1 OPTS=1
+%define _default_patch_fuzz 2
 
 Name:           mingw32-nsis
 Version:        2.39
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        MinGW Windows libxml2 XML processing library
 
 License:        zlib and CPL
@@ -16,14 +17,25 @@ Patch0:         nsis-2.39-debian-64bit-fixes.patch
 Patch1:         nsis-2.39-debian-debug-opt.patch
 
 # This patch is required for NSIS to find the correct cross-compiler.
-Patch2:         nsis-2.39-mingw32-search.patch
+Patch100:       nsis-2.39-mingw32-search.patch
 
 BuildRequires:  mingw32-filesystem >= 20
 BuildRequires:  mingw32-gcc
+BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-binutils
 BuildRequires:  python
 BuildRequires:  scons >= 0.96.93
-BuildRequires:  wxGTK-devel
+
+# We build with 'gcc -m32' and that fails on 64 bit platforms when we
+# include <gnu/stubs.h>.  On x86-64, this is provided by
+# glibc-devel.i386.  Depend on the file explicitly, since only recent
+# versions of RPM let you require a package by architecture.
+BuildRequires:  /usr/include/gnu/stubs-32.h
+
+# We really need the 32 bit version of this library.  The 64 bit
+# version will definitely not work.  XXX Need to do the right thing on
+# non-x86 architectures.
+BuildRequires:  /usr/lib/libwx_baseu-2.8.so
 
 
 %description
@@ -38,9 +50,11 @@ assembler code.
 
 %prep
 %setup -q -n nsis-%{version}-src
+
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+
+%patch100 -p1
 
 
 %build
@@ -66,8 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/nsisconf.nsh
 %{_includedir}/nsis
 %doc %{_docdir}/%{name}-%{version}
+%{_datadir}/nsis
 
 
 %changelog
-* Mon Sep 22 2008 Richard W.M. Jones <rjones@redhat.com> - 2.39-1
+* Wed Oct  8 2008 Richard W.M. Jones <rjones@redhat.com> - 2.39-4
 - Initial RPM release.