rpms/mingw32-nsiswrapper/EL-5 mingw32-nsiswrapper.spec, 1.3, 1.4 nsiswrapper.pl, 1.2, 1.3

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10653

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Synchronize script with Rawhide.


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/mingw32-nsiswrapper.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- mingw32-nsiswrapper.spec	5 Jul 2009 21:06:03 -0000	1.3
+++ mingw32-nsiswrapper.spec	21 Dec 2009 12:05:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
-Version:        3
-Release:        3%{?dist}.2
+Version:        5
+Release:        1%{?dist}
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Dec 21 2009 Richard W.M. Jones <rjones at redhat.com> - 5-1
+- Synchronize script with Rawhide.
+
 * Sun Jul  5 2009 Richard W.M. Jones <rjones at redhat.com> - 3-3.el5.2
 - Add runtime requires mingw32-binutils (RHBZ#509747).
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/nsiswrapper.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nsiswrapper.pl	21 Apr 2009 22:32:25 -0000	1.2
+++ nsiswrapper.pl	21 Dec 2009 12:05:07 -0000	1.3
@@ -443,7 +443,7 @@ sub get_deps_for_file
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
+                   grep -Eio '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {
@@ -493,7 +493,20 @@ sub is_windows_system_dll
 	$_ eq 'ole32.dll' ||
 	$_ eq 'mscoree.dll' ||
 	$_ eq 'msvcrt.dll' ||
-	$_ eq 'user32.dll'
+	$_ eq 'user32.dll' ||
+	$_ eq 'advapi32.dll' ||
+	$_ eq 'comctl32.dll' ||
+	$_ eq 'comdlg32.dll' ||
+	$_ eq 'imm32.dll' ||
+	$_ eq 'msimg32.dll' ||
+	$_ eq 'oleaut32.dll' ||
+	$_ eq 'shell32.dll' ||
+	$_ eq 'shlwapi.dll' ||
+	$_ eq 'winmm.dll' ||
+	$_ eq 'wsock32.dll' ||
+	$_ eq 'ws2_32.dll' ||
+	$_ eq 'wldap32.dll' ||
+	$_ eq 'dnsapi.dll'
 }
 
 # Add Gtk dependencies, if --with-gtk.