rpms/mingw32-nsiswrapper/devel nsiswrapper.pl,1.2,1.3

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-nsiswrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9806

Modified Files:
	nsiswrapper.pl 
Log Message:
Add more system library to nsiswrapper (René Berber)



Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/devel/nsiswrapper.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- nsiswrapper.pl	21 Apr 2009 22:36:15 -0000	1.2
+++ nsiswrapper.pl	9 Jun 2009 08:50:41 -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,19 @@ 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'
 }
 
 # Add Gtk dependencies, if --with-gtk.