projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Now handles hyphenated Perl requirements as well as those in parentheses, and
[freeside.git]
/
rpm
/
rpm2Bundle
diff --git
a/rpm/rpm2Bundle
b/rpm/rpm2Bundle
index
38a7ac2
..
469c27b
100755
(executable)
--- a/
rpm/rpm2Bundle
+++ b/
rpm/rpm2Bundle
@@
-39,7
+39,8
@@
foreach my $rawrpm (@ARGV) {
my %mods;
foreach (@deps) {
my %mods;
foreach (@deps) {
- if (/^perl\((.*)\)\s*(>=\s+([\d\.]+))?$/) {
+ if (/^perl\((.*)\)\s*((>=|=|<=)\s+([\d\.]+))?$/
+ || /^perl-(.*)\s*((>=|=|<=)\s+([\d\.]+))?$/) {
next if exists($suppress{$1});
my @parts = split /::/, $1;
if (scalar @parts > 1) {
next if exists($suppress{$1});
my @parts = split /::/, $1;
if (scalar @parts > 1) {
@@
-47,10
+48,10
@@
foreach my $rawrpm (@ARGV) {
}
if ($verbose) {
print STDERR "$1";
}
if ($verbose) {
print STDERR "$1";
- print STDERR "
>= $3" if $3
;
+ print STDERR "
$3 $4" if $4
;
print STDERR "\n";
}
print STDERR "\n";
}
- $mods{$1} = $
3 ? $3
: undef;
+ $mods{$1} = $
4 ? $4
: undef;
}
}
}
}