[mingw-nsiswrapper: 4/20] Fix dependency problem with + in DLL name (Thomas Sailer).
Kalev Lember
kalev at fedoraproject.org
Wed Mar 7 16:08:22 UTC 2012
commit a1e7c32fdf398911d751c67cf22184cbec615f4a
Author: Richard W.M. Jones <rjones at fedoraproject.org>
Date: Tue Apr 21 22:36:15 2009 +0000
Fix dependency problem with + in DLL name (Thomas Sailer).
mingw32-nsiswrapper.spec | 5 ++++-
nsiswrapper.pl | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/mingw32-nsiswrapper.spec b/mingw32-nsiswrapper.spec
index 07f961b..01cc241 100644
--- a/mingw32-nsiswrapper.spec
+++ b/mingw32-nsiswrapper.spec
@@ -1,6 +1,6 @@
Name: mingw32-nsiswrapper
Version: 3
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Helper program for making NSIS Windows installers
License: GPLv2+
@@ -65,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Apr 21 2009 Richard W.M. Jones <rjones at redhat.com> - 3-5
+- Fix dependency problem with + in DLL name (Thomas Sailer).
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/nsiswrapper.pl b/nsiswrapper.pl
index af466a8..1bd6122 100755
--- a/nsiswrapper.pl
+++ b/nsiswrapper.pl
@@ -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 -Eo '[-._\+[:alnum:]]+\.dll' |
sort -u"; # XXX quoting
open DEPS, "$cmd |" or die "$cmd: $!";
foreach (<DEPS>) {
More information about the scm-commits
mailing list