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

[Richard W.M. Jones]

Author: rjones

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

Modified Files:
	mingw32-nsiswrapper.spec nsiswrapper.pl 
Log Message:
Fix dependency problem with + in DLL name (Thomas Sailer).


Index: mingw32-nsiswrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/mingw32-nsiswrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mingw32-nsiswrapper.spec	21 Feb 2009 17:17:32 -0000	1.1
+++ mingw32-nsiswrapper.spec	21 Apr 2009 22:32:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mingw32-nsiswrapper
 Version:        3
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Helper program for making NSIS Windows installers
 
 License:        GPLv2+
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 3-3.1
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
 * Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 3-3
 - Rebuild for mingw32-gcc 4.4
 


Index: nsiswrapper.pl
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsiswrapper/EL-5/nsiswrapper.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nsiswrapper.pl	21 Feb 2009 17:17:32 -0000	1.1
+++ nsiswrapper.pl	21 Apr 2009 22:32:25 -0000	1.2
@@ -443,7 +443,7 @@
     if (m/\.exe$/i || m/\.dll$/i) {
 	my $cmd = "$objdump -p '$file' |
                    grep 'DLL Name:' |
-                   grep -Eo '[-._[:alnum:]]+\.dll' |
+                   grep -Eo '[-._\+[:alnum:]]+\.dll' |
                    sort -u"; # XXX quoting
 	open DEPS, "$cmd |" or die "$cmd: $!";
 	foreach (<DEPS>) {